mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 17:10:20 -10:00
Compare commits
199
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2da6ddd758 | ||
|
|
df0fd973cc | ||
|
|
1b5fa0e059 | ||
|
|
406b40bb77 | ||
|
|
6ae3e4795c | ||
|
|
61f6da9cb4 | ||
|
|
e31ecb3b41 | ||
|
|
3277e2be43 | ||
|
|
fd325223ba | ||
|
|
a4ac0aa8a5 | ||
|
|
0fb4f03a1b | ||
|
|
48badade21 | ||
|
|
efb6eb891c | ||
|
|
17a2fba78d | ||
|
|
4aa6582504 | ||
|
|
b5c5c55368 | ||
|
|
e0f362764e | ||
|
|
ad64e938a2 | ||
|
|
6dd4ff09f6 | ||
|
|
261b75e047 | ||
|
|
aa2ecc7053 | ||
|
|
3b6c67d61f | ||
|
|
63a8b08dd7 | ||
|
|
db5f38402f | ||
|
|
c1c70a3622 | ||
|
|
bb17db90a1 | ||
|
|
d6e5957ecb | ||
|
|
4051586e6f | ||
|
|
1f174145d1 | ||
|
|
861e52e25c | ||
|
|
d036958986 | ||
|
|
87315d19c6 | ||
|
|
f7f280c739 | ||
|
|
866d0ad482 | ||
|
|
0f9bb15622 | ||
|
|
c60f2c4ca2 | ||
|
|
83d6abd219 | ||
|
|
7a5df3c524 | ||
|
|
dc312c772f | ||
|
|
e0e185d70a | ||
|
|
7c6f619ae5 | ||
|
|
975765dbab | ||
|
|
ffc3a83d9b | ||
|
|
3826a69bc0 | ||
|
|
ccd3e6ff12 | ||
|
|
1710dd74fe | ||
|
|
05e8f2b8d7 | ||
|
|
5de513945b | ||
|
|
e23e916f26 | ||
|
|
ff197eb405 | ||
|
|
77a53f0dc9 | ||
|
|
4b0b545236 | ||
|
|
d3356e6aab | ||
|
|
23675d6292 | ||
|
|
8bbebd920a | ||
|
|
009e2d8835 | ||
|
|
6102b95385 | ||
|
|
af165436b5 | ||
|
|
c354ac8ac1 | ||
|
|
1003597c4e | ||
|
|
eb3f9147ae | ||
|
|
e5246d94ab | ||
|
|
f93caff1c8 | ||
|
|
7363f1ac3d | ||
|
|
f783d29462 | ||
|
|
649f509f04 | ||
|
|
c7d8d247c3 | ||
|
|
7bdbadbbb4 | ||
|
|
68baa2967d | ||
|
|
ab04c61b60 | ||
|
|
8ba48b5a41 | ||
|
|
60b180d24f | ||
|
|
e427266501 | ||
|
|
929e4b08a4 | ||
|
|
23ea930161 | ||
|
|
ee43f5a4ad | ||
|
|
c996dac676 | ||
|
|
6b58f13177 | ||
|
|
83a809553f | ||
|
|
b3f9ee4413 | ||
|
|
740013d051 | ||
|
|
381d11c97e | ||
|
|
c4d1df972e | ||
|
|
841ffc2334 | ||
|
|
6e885dec43 | ||
|
|
492f66c60f | ||
|
|
2eba6b82ec | ||
|
|
dbb76ea0c3 | ||
|
|
bf3d8ce52d | ||
|
|
9527a8e4dd | ||
|
|
8d36d250bc | ||
|
|
9cfdeb1a2e | ||
|
|
29428d9516 | ||
|
|
10ab6b7753 | ||
|
|
64ecc5d064 | ||
|
|
95f4da3358 | ||
|
|
8668a85552 | ||
|
|
c709e42040 | ||
|
|
fa9acab811 | ||
|
|
6b86787945 | ||
|
|
9f8e2cd16a | ||
|
|
edba55b883 | ||
|
|
3495c6054f | ||
|
|
a02ef6352d | ||
|
|
f202cffa2b | ||
|
|
93d0e9ed4d | ||
|
|
ad179f61d7 | ||
|
|
723037ab13 | ||
|
|
04a275df98 | ||
|
|
cae8dd6dbd | ||
|
|
05d5204da8 | ||
|
|
c0e6ecb6c2 | ||
|
|
e0b1d66519 | ||
|
|
8c9c37c45b | ||
|
|
11e18c2a5d | ||
|
|
fba6bfc954 | ||
|
|
6ca7b346cd | ||
|
|
5f5c5e97a0 | ||
|
|
f6bf1d427b | ||
|
|
891941ecbe | ||
|
|
a2407ac76a | ||
|
|
e9e17e069e | ||
|
|
84c9542f15 | ||
|
|
57ad62b9ec | ||
|
|
08938db840 | ||
|
|
4bce944f45 | ||
|
|
b9b639c6a5 | ||
|
|
1b249d561e | ||
|
|
742590f5b4 | ||
|
|
69f99f1633 | ||
|
|
c7acb025f5 | ||
|
|
4a8adbd8dc | ||
|
|
6d018681ee | ||
|
|
ff76904cbe | ||
|
|
e3ffc2e984 | ||
|
|
9c00f0c0c4 | ||
|
|
43e0e6b941 | ||
|
|
61dde4b1de | ||
|
|
f0bfd787e3 | ||
|
|
710149b90a | ||
|
|
8aafd8660e | ||
|
|
a90d5c7865 | ||
|
|
5a7ff666c5 | ||
|
|
7924c406d9 | ||
|
|
58a491b96c | ||
|
|
99e3bc8904 | ||
|
|
252d61d055 | ||
|
|
5e9081600f | ||
|
|
cd09ddbc55 | ||
|
|
76d7ab281d | ||
|
|
f3e04b182a | ||
|
|
68eb7bc3f8 | ||
|
|
9eecae812c | ||
|
|
f08f228fcf | ||
|
|
4ad5fc61c6 | ||
|
|
7ac259dc67 | ||
|
|
d5ebaad99d | ||
|
|
198a7c6482 | ||
|
|
1b1ba678b7 | ||
|
|
c593c1e351 | ||
|
|
7bf60c3ec9 | ||
|
|
746a3d0214 | ||
|
|
f9287857f2 | ||
|
|
2aadbf1724 | ||
|
|
c90690310c | ||
|
|
e5fa0b75b4 | ||
|
|
aeceaa7e1e | ||
|
|
19cba1df37 | ||
|
|
5ec0243196 | ||
|
|
da807f6f90 | ||
|
|
1e3fb99fa3 | ||
|
|
85e33cfdba | ||
|
|
2d43cf694f | ||
|
|
4f6e01edcd | ||
|
|
61588a1d53 | ||
|
|
2b90049bcc | ||
|
|
09ea581914 | ||
|
|
7758f54dcf | ||
|
|
dd34edb907 | ||
|
|
27790b9495 | ||
|
|
8be2726e12 | ||
|
|
1724ce22a3 | ||
|
|
d7ac79ccc0 | ||
|
|
4d5d54f7a8 | ||
|
|
5a581fb229 | ||
|
|
b683e1076a | ||
|
|
657ff6d38a | ||
|
|
233212bd24 | ||
|
|
3dac926be3 | ||
|
|
50b6a2e823 | ||
|
|
63a49e9eb8 | ||
|
|
67c9ed311c | ||
|
|
6a867bd856 | ||
|
|
399c2c89c7 | ||
|
|
cd5f5282f2 | ||
|
|
df86ddf49b | ||
|
|
27d68cef08 | ||
|
|
4b2d74f1a1 | ||
|
|
1057d0329a |
No files matched your search
File renamed without changes.
@@ -0,0 +1,40 @@
|
||||
## Steps to Reproduce
|
||||
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
|
||||
<!--
|
||||
You may drag & drop the attachement (repro code/solution, screenshot, etc.) onto the issue.
|
||||
-->
|
||||
|
||||
## Current Behavior
|
||||
|
||||
<!--
|
||||
What is the current behavior?
|
||||
-->
|
||||
|
||||
## Expected Behavior
|
||||
|
||||
<!--
|
||||
Please describe the behavior you are expecting
|
||||
-->
|
||||
|
||||
### On which platforms did you notice this
|
||||
|
||||
[ ] macOS
|
||||
[ ] Linux
|
||||
[ ] Windows
|
||||
|
||||
**Version Used**:
|
||||
|
||||
<!--
|
||||
You can use `mono --version` or About dialog to obtain this information.
|
||||
-->
|
||||
|
||||
### Stacktrace
|
||||
|
||||
```
|
||||
Please paste the stacktrace here if available.
|
||||
```
|
||||
|
||||
+8
-3
@@ -58,7 +58,7 @@
|
||||
/mcs/errors @marek-safar
|
||||
/mcs/ilasm @marek-safar
|
||||
/mcs/jay @marek-safar
|
||||
/mcs/mcs @marek-safar
|
||||
/mcs/mcs @marek-safar @lewurm
|
||||
/mcs/tests @marek-safar
|
||||
/mcs/tools @marek-safar @akoeplinger
|
||||
|
||||
@@ -83,13 +83,18 @@
|
||||
/mono/mini/*exceptions* @lewurm
|
||||
/mono/mini/*ppc* @lewurm
|
||||
/mono/mini/*type-check* @lewurm
|
||||
/mono/mini/interp/* @lewurm
|
||||
/mono/mini/interp/* @lewurm @BrzVlad
|
||||
/mono/mini/*profiler* @alexrp
|
||||
/mono/mini/debugger-agent.c @DavidKarlas
|
||||
|
||||
/mono/profiler @alexrp @kumpera
|
||||
|
||||
/mono/sgen @brzvlad @kumpera
|
||||
/mono/sdks @luhenry
|
||||
/mono/sdks/android @luhenry @jonpryor
|
||||
/mono/sdks/ios @vargaz @rolfbjarne
|
||||
/mono/sdks/wasm @kumpera @lrz
|
||||
|
||||
/mono/sgen @BrzVlad @kumpera
|
||||
|
||||
/mono/utils @kumpera @vargaz
|
||||
/mono/utils/atomic* @alexrp
|
||||
|
||||
+6
-5
@@ -50,6 +50,7 @@ dist-hook:
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
|
||||
rm -rf "$(top_distdir)/external/linker/linker/Tests"
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
noinst_DATA = mono-uninstalled.pc
|
||||
@@ -120,7 +121,7 @@ update-csproj:
|
||||
-rm msvc/scripts/order.xml
|
||||
-rm -rf msvc/scripts/inputs
|
||||
-mkdir msvc/scripts/inputs
|
||||
(cd runtime; make V=1 extra_targets=csproj-local)
|
||||
(cd runtime; $(MAKE) V=1 extra_targets=csproj-local)
|
||||
|
||||
package-inputs:
|
||||
echo '<?xml version="1.0" encoding="utf-8"?>' > msvc/scripts/order.xml
|
||||
@@ -149,9 +150,9 @@ update-llvm-version:
|
||||
|
||||
|
||||
update-solution-files:
|
||||
make update-csproj
|
||||
make package-inputs
|
||||
(cd msvc/scripts; make genproj.exe; mono genproj.exe $(GENPROJ_ARGS))
|
||||
$(MAKE) update-csproj
|
||||
$(MAKE) package-inputs
|
||||
(cd msvc/scripts; $(MAKE) genproj.exe; mono genproj.exe $(GENPROJ_ARGS))
|
||||
|
||||
update-solution-files-with-tests:
|
||||
make "GENPROJ_ARGS=2012 true true" update-solution-files
|
||||
$(MAKE) "GENPROJ_ARGS=2012 true true" update-solution-files
|
||||
@@ -174,8 +174,7 @@ section.
|
||||
Reporting bugs
|
||||
==============
|
||||
|
||||
To submit bug reports, please use [Xamarin's
|
||||
Bugzilla](https://bugzilla.xamarin.com/)
|
||||
To submit bug reports, please [open an issue on the mono GitHub repo](https://github.com/mono/mono/issues/new).
|
||||
|
||||
Please use the search facility to ensure the same bug hasn't already
|
||||
been submitted and follow our
|
||||
|
||||
+71
-14
@@ -1,8 +1,8 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [5.9.0],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
AC_INIT(mono, [5.11.0],
|
||||
[https://github.com/mono/mono/issues/new])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
@@ -100,7 +100,7 @@ extra_runtime_ldflags=""
|
||||
# Hack for WASM
|
||||
# Current autotools (v1.15) doesn't have a triplet we can use for wasm so the kludge we do is to
|
||||
# work around it by using a feature flag instead
|
||||
AC_ARG_ENABLE(wasm,[ --enable-wasm Hack to set the current runtime to target wasm], enable_wasm=$enableval)
|
||||
AC_ARG_ENABLE(wasm,[ --enable-wasm Hack to set the current runtime to target wasm], enable_wasm=$enableval)
|
||||
|
||||
# Thread configuration inspired by sleepycat's db
|
||||
AC_MSG_CHECKING([host platform characteristics])
|
||||
@@ -123,6 +123,7 @@ CFLAGS="$CFLAGS -D_REENTRANT -D_GNU_SOURCE -DNO_UNALIGNED_ACCESS -s WASM=1"
|
||||
CPPFLAGS="$CPPFLAGS -D_REENTRANT -DUSE_MMAP -D_GNU_SOURCE -DNO_UNALIGNED_ACCESS -s WASM=1"
|
||||
libdl="-ldl"
|
||||
libgc_threads=pthreads
|
||||
platform_wasm=yes
|
||||
|
||||
else
|
||||
|
||||
@@ -206,6 +207,7 @@ case "$host" in
|
||||
;;
|
||||
*-*-*openbsd*)
|
||||
CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_OPENBSD_THREADS -DHOST_BSD -D_REENTRANT -DUSE_MMAP"
|
||||
LDFLAGS="${LDFLAGS} -Wl,-zwxneeded"
|
||||
if test "x$disable_munmap" != "xyes"; then
|
||||
CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
|
||||
fi
|
||||
@@ -215,6 +217,7 @@ case "$host" in
|
||||
AC_DEFINE(PTHREAD_POINTER_ID)
|
||||
libdl=
|
||||
libgc_threads=pthreads
|
||||
with_tls=pthread
|
||||
with_sigaltstack=no
|
||||
use_sigposix=yes
|
||||
with_sgen_default_concurrent=yes
|
||||
@@ -368,8 +371,6 @@ case "$host" in
|
||||
AC_DEFINE(PTHREAD_POINTER_ID)
|
||||
dnl Haiku does not support static TLS with __thread
|
||||
with_tls=pthread
|
||||
dnl Boehm is too much work to backport Haiku support for
|
||||
support_boehm=no
|
||||
libgc_threads=pthreads
|
||||
use_sigposix=yes
|
||||
;;
|
||||
@@ -413,6 +414,7 @@ AM_CONDITIONAL(HOST_SIGPOSIX, test x$use_sigposix = xyes)
|
||||
AM_CONDITIONAL(HOST_ANDROID, test x$platform_android = xyes)
|
||||
AM_CONDITIONAL(HOST_TIZEN, test x$platform_tizen = xyes)
|
||||
AM_CONDITIONAL(HOST_IOS, test x$platform_ios = xyes)
|
||||
AM_CONDITIONAL(HOST_WASM, test x$platform_wasm = xyes)
|
||||
|
||||
if test -z "$HOST_DARWIN_TRUE"; then :
|
||||
PLATFORM_AOT_SUFFIX=.dylib
|
||||
@@ -913,6 +915,51 @@ if test $csc_compiler = default; then
|
||||
fi
|
||||
AC_MSG_RESULT($csc_compiler)
|
||||
|
||||
AC_ARG_WITH(jemalloc, [ --with-jemalloc=yes,no If jemalloc is enabled (defaults to no)], [], [with_jemalloc=no])
|
||||
AC_ARG_WITH(jemalloc-always, [ --with-jemalloc_always=yes,no If jemalloc is enabled and always used (defaults to yes)], [], [with_jemalloc_always=no])
|
||||
AC_ARG_WITH(jemalloc-assert, [ --with-jemalloc_assert=yes,no If jemalloc performs runtime checks for memory correctness (defaults to no)], [], [with_jemalloc_assert=no])
|
||||
|
||||
|
||||
if test x$target_win32 = xyes; then
|
||||
with_jemalloc=no
|
||||
with_jemalloc_assert=no
|
||||
with_jemalloc_always=no
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(MONO_JEMALLOC_ASSERT, [test "x$with_jemalloc_assert" = "xyes"])
|
||||
if test "x$with_jemalloc_assert" = "xyes"; then
|
||||
JEMALLOC_CFLAGS+=" -DMONO_JEMALLOC_ASSERT"
|
||||
AC_DEFINE(MONO_JEMALLOC_ASSERT, 1, [Make jemalloc assert for mono])
|
||||
AC_SUBST(MONO_JEMALLOC_ASSERT, 1)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(MONO_JEMALLOC_DEFAULT, [test "x$with_jemalloc_always" = "xyes"])
|
||||
if test "x$with_jemalloc_always" = "xyes"; then
|
||||
with_jemalloc=yes
|
||||
JEMALLOC_CFLAGS+=" -DMONO_JEMALLOC_DEFAULT"
|
||||
AC_DEFINE(MONO_JEMALLOC_DEFAULT, 1, [Make jemalloc default for mono])
|
||||
AC_SUBST(MONO_JEMALLOC_DEFAULT, 1)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(MONO_JEMALLOC_ENABLED, [test "x$with_jemalloc" = "xyes"])
|
||||
if test "x$with_jemalloc" = "xyes"; then
|
||||
JEMALLOC_LDFLAGS="-L`pwd`/mono/utils/jemalloc/jemalloc/lib -ljemalloc_pic"
|
||||
JEMALLOC_CFLAGS+=" -DMONO_JEMALLOC_ENABLED -I `pwd`/mono/utils/jemalloc/jemalloc/include"
|
||||
JEMALLOC_AUTOCONF_FLAGS=" --build=$target --host=$host"
|
||||
|
||||
if test "x$target_mach" = "xyes"; then
|
||||
JEMALLOC_CPPFLAGS=" -stdlib=libc++ "
|
||||
fi
|
||||
|
||||
AC_DEFINE(MONO_JEMALLOC_ENABLED, 1, [Enable jemalloc usage for mono])
|
||||
AC_SUBST(MONO_JEMALLOC_ENABLED, 1)
|
||||
|
||||
AC_SUBST(JEMALLOC_CFLAGS)
|
||||
AC_SUBST(JEMALLOC_CPPFLAGS)
|
||||
AC_SUBST(JEMALLOC_LDFLAGS)
|
||||
AC_SUBST(JEMALLOC_AUTOCONF_FLAGS)
|
||||
fi
|
||||
|
||||
#
|
||||
# Set the build profiles and options before things which use them
|
||||
#
|
||||
@@ -2627,7 +2674,7 @@ if test x$host_win32 = xno; then
|
||||
[#include <sys/types.h>
|
||||
#include <sys/vfs.h>])
|
||||
AC_CHECK_MEMBERS(
|
||||
[struct stat.st_atim, struct stat.st_mtim, struct stat.st_ctim],,,
|
||||
[struct stat.st_atim, struct stat.st_mtim, struct stat.st_atimespec, struct stat.st_ctim],,,
|
||||
[#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>])
|
||||
@@ -2673,8 +2720,10 @@ if test x$host_win32 = xno; then
|
||||
dnl *********************************
|
||||
dnl *** Checks for random ***
|
||||
dnl *********************************
|
||||
AC_CHECK_HEADERS(sys/random.h)
|
||||
AC_CHECK_FUNCS(getrandom getentropy)
|
||||
if test x$host_darwin = xno; then
|
||||
AC_CHECK_HEADERS(sys/random.h)
|
||||
AC_CHECK_FUNCS(getrandom getentropy)
|
||||
fi
|
||||
else
|
||||
dnl *********************************
|
||||
dnl *** Checks for Windows compilation ***
|
||||
@@ -3269,6 +3318,9 @@ case "$host" in
|
||||
BTLS_PLATFORM=i386
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
AOT_SUPPORTED="yes"
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=i386
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -3293,6 +3345,9 @@ case "$host" in
|
||||
boehm_supported=false
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
AOT_SUPPORTED="yes"
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=x86_64
|
||||
;;
|
||||
mingw*)
|
||||
;;
|
||||
@@ -4393,22 +4448,22 @@ if test "x$enable_btls" = "xyes"; then
|
||||
btls_arch=aarch64
|
||||
;;
|
||||
android-armv5)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=12"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
;;
|
||||
android-armv6)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=12"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
;;
|
||||
android-armv7)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi-v7a\" -DANDROID_NATIVE_API_LEVEL=12"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi-v7a\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
;;
|
||||
android-v8a)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"arm64-v8a\" -DANDROID_NATIVE_API_LEVEL=12"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"arm64-v8a\" -DANDROID_NATIVE_API_LEVEL=21"
|
||||
;;
|
||||
android-x86)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86\" -DANDROID_NATIVE_API_LEVEL=12"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
;;
|
||||
android-x64)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86_64\" -DANDROID_NATIVE_API_LEVEL=12"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86_64\" -DANDROID_NATIVE_API_LEVEL=21"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR(Invalid BTLS platform)
|
||||
@@ -4694,6 +4749,7 @@ scripts/mono-find-requires
|
||||
mono/Makefile
|
||||
mono/btls/Makefile
|
||||
mono/utils/Makefile
|
||||
mono/utils/jemalloc/Makefile
|
||||
mono/metadata/Makefile
|
||||
mono/dis/Makefile
|
||||
mono/cil/Makefile
|
||||
@@ -4933,6 +4989,7 @@ echo "
|
||||
libgdiplus: $libgdiplus_msg
|
||||
zlib: $zlib_msg
|
||||
BTLS: $enable_btls$btls_platform_string
|
||||
jemalloc: $with_jemalloc (always use: $with_jemalloc_always)
|
||||
$disabled
|
||||
"
|
||||
if test x$with_static_mono = xno -a "x$host_win32" != "xyes"; then
|
||||
|
||||
Vendored
+1
-1
Submodule external/api-snapshot updated: 8482d12f29...2b6a61c962.
Vendored
+1
-1
Submodule external/binary-reference-assemblies updated: e5d94c4fc9...9f07d0746d.
Vendored
+1
-1
Submodule external/bockbuild updated: 694c7ecabf...e22032cad6.
Vendored
+1
-1
Submodule external/cecil updated: 1afa0668b3...dfee11e80d.
Vendored
+1
-1
Submodule external/corefx updated: e1f502de7f...dfd98e7113.
Vendored
+1
-1
Submodule external/linker updated: 404f7316f9...ab2053f760.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: 85d026c98a...00da53c474.
+1
-1
@@ -49,7 +49,7 @@ obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
|
||||
solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \
|
||||
backgraph.c win32_threads.c \
|
||||
pthread_support.c pthread_stop_world.c darwin_stop_world.c \
|
||||
openbsd_stop_world.c mach_dep.c $(asm_libgc_sources)
|
||||
mach_dep.c $(asm_libgc_sources)
|
||||
|
||||
# Include THREADDLLIBS here to ensure that the correct versions of
|
||||
# linuxthread semaphore functions get linked:
|
||||
|
||||
@@ -104,6 +104,10 @@ case "$THREADS" in
|
||||
AC_DEFINE(GC_AIX_THREADS)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
*-*-haiku*)
|
||||
AC_DEFINE(GC_HAIKU_THREADS)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
*-*-hpux*)
|
||||
AC_MSG_WARN("Only HP/UX 11 threads are supported.")
|
||||
AC_DEFINE(GC_HPUX_THREADS)
|
||||
|
||||
+18
-1
@@ -59,7 +59,7 @@
|
||||
!(defined(FREEBSD) && defined(__ELF__)) && \
|
||||
!(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \
|
||||
!(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
|
||||
!defined(DARWIN)
|
||||
!defined(DARWIN) && !defined(HAIKU)
|
||||
--> We only know how to find data segments of dynamic libraries for the
|
||||
--> above. Additional SVR4 variants might not be too
|
||||
--> hard to add.
|
||||
@@ -1258,6 +1258,23 @@ GC_bool GC_register_main_static_data()
|
||||
|
||||
#endif /* DARWIN */
|
||||
|
||||
#if defined(HAIKU)
|
||||
|
||||
#include <kernel/image.h>
|
||||
|
||||
void GC_register_dynamic_libraries()
|
||||
{
|
||||
image_info info;
|
||||
int32 cookie = 0;
|
||||
while (get_next_image_info(0, &cookie, &info) == B_OK)
|
||||
{
|
||||
void *data = info.data;
|
||||
GC_add_roots_inner(data, data + info.data_size, TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* HAIKU */
|
||||
|
||||
#else /* !DYNAMIC_LOADING */
|
||||
|
||||
#ifdef PCR
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \
|
||||
defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
|
||||
defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \
|
||||
defined(GC_OPENBSD_THREADS) || \
|
||||
defined(GC_OPENBSD_THREADS) || defined(GC_HAIKU_THREADS) ||\
|
||||
(defined(GC_WIN32_THREADS) && defined(__CYGWIN32__))
|
||||
# define GC_PTHREADS
|
||||
# endif
|
||||
|
||||
@@ -1979,6 +1979,8 @@ void GC_err_puts GC_PROTO((GC_CONST char *s));
|
||||
/* Linuxthreads itself uses SIGUSR1 and SIGUSR2. */
|
||||
# define SIG_SUSPEND SIGPWR
|
||||
# endif
|
||||
# elif defined(GC_OPENBSD_THREADS)
|
||||
# define SIG_SUSPEND SIGXFSZ
|
||||
# else /* !GC_LINUX_THREADS */
|
||||
# if defined(_SIGRTMIN)
|
||||
# define SIG_SUSPEND _SIGRTMIN + 6
|
||||
|
||||
@@ -238,6 +238,16 @@
|
||||
# define BEOS
|
||||
# define mach_type_known
|
||||
# endif
|
||||
# if defined(__HAIKU__) && defined(_X86_)
|
||||
# define I386
|
||||
# define HAIKU
|
||||
# define mach_type_known
|
||||
# endif
|
||||
# if defined(__HAIKU__) && defined(__amd64__)
|
||||
# define X86_64
|
||||
# define HAIKU
|
||||
# define mach_type_known
|
||||
# endif
|
||||
# if defined(LINUX) && (defined(i386) || defined(__i386__))
|
||||
# define I386
|
||||
# define mach_type_known
|
||||
@@ -1164,6 +1174,15 @@
|
||||
extern int etext[];
|
||||
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
# endif
|
||||
# ifdef HAIKU
|
||||
# define OS_TYPE "HAIKU"
|
||||
# include <OS.h>
|
||||
# define GETPAGESIZE() B_PAGE_SIZE
|
||||
extern int etext[];
|
||||
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
# define DYNAMIC_LOADING
|
||||
# define MPROTECT_VDB
|
||||
# endif
|
||||
# ifdef SUNOS5
|
||||
# define OS_TYPE "SUNOS5"
|
||||
extern int _etext[], _end[];
|
||||
@@ -2134,6 +2153,15 @@
|
||||
/* There seems to be some issues with trylock hanging on darwin. This
|
||||
should be looked into some more */
|
||||
# endif
|
||||
# ifdef HAIKU
|
||||
# define OS_TYPE "HAIKU"
|
||||
# include <OS.h>
|
||||
# define GETPAGESIZE() B_PAGE_SIZE
|
||||
extern int etext[];
|
||||
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
# define DYNAMIC_LOADING
|
||||
# define MPROTECT_VDB
|
||||
# endif
|
||||
# ifdef FREEBSD
|
||||
# define OS_TYPE "FREEBSD"
|
||||
# ifndef GC_FREEBSD_THREADS
|
||||
@@ -2251,7 +2279,7 @@
|
||||
# if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
|
||||
|| defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
|
||||
|| defined(DGUX) || defined(BSD) || defined(SUNOS4) \
|
||||
|| defined(_AIX) || defined(DARWIN) || defined(OSF1)
|
||||
|| defined(_AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU)
|
||||
# define UNIX_LIKE /* Basic Unix-like system calls work. */
|
||||
# endif
|
||||
|
||||
@@ -2507,6 +2535,9 @@
|
||||
# if defined(SN_TARGET_PS3)
|
||||
extern void *ps3_get_mem (size_t size);
|
||||
# define GET_MEM(bytes) (struct hblk*) ps3_get_mem (bytes)
|
||||
# elif defined(HAIKU)
|
||||
ptr_t GC_haiku_get_mem(GC_word bytes);
|
||||
# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes)
|
||||
# else
|
||||
extern ptr_t GC_unix_get_mem(word size);
|
||||
# define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
#ifndef GC_OPENBSD_STOP_WORLD_H
|
||||
#define GC_OPENBSD_STOP_WORLD_H
|
||||
|
||||
#if !defined(GC_OPENBSD_THREADS)
|
||||
#error openbsd_stop_world.h included without GC_OPENBSD_THREADS defined
|
||||
#endif
|
||||
|
||||
struct thread_stop_info {
|
||||
ptr_t stack_ptr; /* Valid only when stopped. */
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -8,8 +8,6 @@
|
||||
|
||||
#if defined(GC_DARWIN_THREADS)
|
||||
# include "private/darwin_stop_world.h"
|
||||
#elif defined(GC_OPENBSD_THREADS)
|
||||
# include "private/openbsd_stop_world.h"
|
||||
#else
|
||||
# include "private/pthread_stop_world.h"
|
||||
#endif
|
||||
|
||||
@@ -1,161 +0,0 @@
|
||||
#include "private/pthread_support.h"
|
||||
|
||||
/* derived from pthread_stop_world.c */
|
||||
|
||||
# if defined(GC_OPENBSD_THREADS)
|
||||
|
||||
#define THREAD_EQUAL(id1, id2) pthread_equal(id1, id2)
|
||||
|
||||
/* We hold allocation lock. Should do exactly the right thing if the */
|
||||
/* world is stopped. Should not fail if it isn't. */
|
||||
void GC_push_all_stacks()
|
||||
{
|
||||
GC_bool found_me = FALSE;
|
||||
size_t nthreads = 0;
|
||||
int i;
|
||||
GC_thread p;
|
||||
ptr_t lo, hi;
|
||||
pthread_t me = pthread_self();
|
||||
|
||||
if (!GC_thr_initialized) GC_thr_init();
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("Pushing stacks from thread 0x%x\n", (unsigned) me);
|
||||
# endif
|
||||
for (i = 0; i < THREAD_TABLE_SZ; i++) {
|
||||
for (p = GC_threads[i]; p != 0; p = p -> next) {
|
||||
if (p -> flags & FINISHED) continue;
|
||||
++nthreads;
|
||||
if (THREAD_EQUAL(p -> id, me)) {
|
||||
# ifdef SPARC
|
||||
lo = (ptr_t)GC_save_regs_in_stack();
|
||||
# else
|
||||
lo = GC_approx_sp();
|
||||
# endif
|
||||
found_me = TRUE;
|
||||
} else {
|
||||
lo = p -> stop_info.stack_ptr;
|
||||
}
|
||||
if ((p -> flags & MAIN_THREAD) == 0) {
|
||||
hi = p -> stack_end;
|
||||
} else {
|
||||
/* The original stack. */
|
||||
hi = GC_stackbottom;
|
||||
}
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("Stack for thread 0x%x = [%p,%p)\n",
|
||||
(unsigned)(p -> id), lo, hi);
|
||||
# endif
|
||||
if (0 == lo) ABORT("GC_push_all_stacks: sp not set!\n");
|
||||
# ifdef STACK_GROWS_UP
|
||||
/* We got them backwards! */
|
||||
GC_push_all_stack(hi, lo);
|
||||
# else
|
||||
GC_push_all_stack(lo, hi);
|
||||
# endif
|
||||
}
|
||||
}
|
||||
if (!found_me && !GC_in_thread_creation)
|
||||
ABORT("Collecting from unknown thread.");
|
||||
}
|
||||
|
||||
/* We hold the allocation lock. Suspend all threads that might */
|
||||
/* still be running. */
|
||||
void GC_suspend_all()
|
||||
{
|
||||
int i;
|
||||
GC_thread p;
|
||||
int result;
|
||||
pthread_t my_thread = pthread_self();
|
||||
|
||||
for (i = 0; i < THREAD_TABLE_SZ; i++) {
|
||||
for (p = GC_threads[i]; p != 0; p = p -> next) {
|
||||
if (!THREAD_EQUAL(p -> id, my_thread)) {
|
||||
if (p -> flags & FINISHED) continue;
|
||||
if (p -> thread_blocked) /* Will wait */ continue;
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("Suspending thread 0x%x\n",
|
||||
(unsigned)(p -> id));
|
||||
# endif
|
||||
|
||||
if (pthread_suspend_np(p -> id) != 0)
|
||||
ABORT("pthread_suspend_np failed");
|
||||
|
||||
/*
|
||||
* This will only work for userland pthreads. It will
|
||||
* fail badly on rthreads. Perhaps we should consider
|
||||
* a pthread_sp_np() function that returns the stack
|
||||
* pointer for a suspended thread and implement in
|
||||
* both pthreads and rthreads.
|
||||
*/
|
||||
p -> stop_info.stack_ptr = *(ptr_t*)((char *)p -> id + UTHREAD_SP_OFFSET);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void GC_stop_world()
|
||||
{
|
||||
int i;
|
||||
|
||||
GC_ASSERT(I_HOLD_LOCK());
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("Stopping the world from 0x%x\n", (unsigned)pthread_self());
|
||||
# endif
|
||||
|
||||
/* Make sure all free list construction has stopped before we start. */
|
||||
/* No new construction can start, since free list construction is */
|
||||
/* required to acquire and release the GC lock before it starts, */
|
||||
/* and we have the lock. */
|
||||
# ifdef PARALLEL_MARK
|
||||
GC_acquire_mark_lock();
|
||||
GC_ASSERT(GC_fl_builder_count == 0);
|
||||
/* We should have previously waited for it to become zero. */
|
||||
# endif /* PARALLEL_MARK */
|
||||
|
||||
GC_suspend_all();
|
||||
|
||||
# ifdef PARALLEL_MARK
|
||||
GC_release_mark_lock();
|
||||
# endif
|
||||
#if DEBUG_THREADS
|
||||
GC_printf("World stopped from 0x%x\n", (unsigned)pthread_self());
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Caller holds allocation lock, and has held it continuously since */
|
||||
/* the world stopped. */
|
||||
void GC_start_world()
|
||||
{
|
||||
pthread_t my_thread = pthread_self();
|
||||
register int i;
|
||||
register GC_thread p;
|
||||
register int result;
|
||||
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("World starting\n");
|
||||
# endif
|
||||
|
||||
for (i = 0; i < THREAD_TABLE_SZ; i++) {
|
||||
for (p = GC_threads[i]; p != 0; p = p -> next) {
|
||||
if (!THREAD_EQUAL(p -> id, my_thread)) {
|
||||
if (p -> flags & FINISHED) continue;
|
||||
if (p -> thread_blocked) continue;
|
||||
#if DEBUG_THREADS
|
||||
GC_printf("Resuming thread 0x%x\n",
|
||||
(unsigned)(p -> id));
|
||||
#endif
|
||||
|
||||
if (pthread_resume_np(p -> id) != 0)
|
||||
ABORT("pthread_kill failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("World started\n");
|
||||
# endif
|
||||
}
|
||||
|
||||
void GC_stop_init() {
|
||||
}
|
||||
|
||||
#endif
|
||||
+31
-9
@@ -609,7 +609,7 @@ void GC_enable_signals(void)
|
||||
&& !defined(MACOS) && !defined(DJGPP) && !defined(DOS4GW) \
|
||||
&& !defined(NOSYS) && !defined(ECOS) && !defined(SN_TARGET_PS3)
|
||||
|
||||
# if defined(sigmask) && !defined(UTS4) && !defined(HURD)
|
||||
# if defined(sigmask) && !defined(UTS4) && !defined(HURD) && !defined(HAIKU)
|
||||
/* Use the traditional BSD interface */
|
||||
# define SIGSET_T int
|
||||
# define SIG_DEL(set, signal) (set) &= ~(sigmask(signal))
|
||||
@@ -764,14 +764,14 @@ ptr_t GC_get_stack_base()
|
||||
|
||||
# endif /* MS Windows */
|
||||
|
||||
# ifdef BEOS
|
||||
# ifdef HAIKU
|
||||
# include <kernel/OS.h>
|
||||
ptr_t GC_get_stack_base(){
|
||||
thread_info th;
|
||||
get_thread_info(find_thread(NULL),&th);
|
||||
return th.stack_end;
|
||||
}
|
||||
# endif /* BEOS */
|
||||
# endif /* HAIKU */
|
||||
|
||||
|
||||
# ifdef OS2
|
||||
@@ -1122,7 +1122,7 @@ void *GC_set_stackbottom = NULL;
|
||||
|
||||
#endif /* FREEBSD_STACKBOTTOM */
|
||||
|
||||
#if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \
|
||||
#if !defined(HAIKU) && !defined(AMIGA) && !defined(MSWIN32) \
|
||||
&& !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) \
|
||||
&& !defined(GC_OPENBSD_THREADS)
|
||||
|
||||
@@ -1182,7 +1182,7 @@ ptr_t GC_get_stack_base()
|
||||
# endif /* STACKBOTTOM */
|
||||
}
|
||||
|
||||
# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */
|
||||
# endif /* ! AMIGA, !OS 2, ! MS Windows, !HAIKU, !NOSYS, !ECOS */
|
||||
|
||||
#if defined(GC_OPENBSD_THREADS)
|
||||
|
||||
@@ -1957,6 +1957,19 @@ word bytes;
|
||||
}
|
||||
# endif
|
||||
|
||||
#if defined(HAIKU)
|
||||
#include <stdlib.h>
|
||||
|
||||
ptr_t GC_haiku_get_mem(word bytes)
|
||||
{
|
||||
void* mem;
|
||||
if (posix_memalign(&mem, GC_page_size, bytes) == 0)
|
||||
return mem;
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_MUNMAP
|
||||
|
||||
/* For now, this only works on Win32/WinCE and some Unix-like */
|
||||
@@ -2393,7 +2406,9 @@ GC_bool is_ptrfree;
|
||||
|
||||
# include <sys/mman.h>
|
||||
# include <signal.h>
|
||||
# include <sys/syscall.h>
|
||||
# if !defined(HAIKU)
|
||||
# include <sys/syscall.h>
|
||||
# endif
|
||||
|
||||
# define PROTECT(addr, len) \
|
||||
if (mprotect((caddr_t)(addr), (size_t)(len), \
|
||||
@@ -2450,13 +2465,13 @@ GC_bool is_ptrfree;
|
||||
#endif /* SUNOS4 || (FREEBSD && !SUNOS5SIGS) */
|
||||
|
||||
#if defined(SUNOS5SIGS) || defined(OSF1) || defined(LINUX) \
|
||||
|| defined(HURD)
|
||||
|| defined(HURD) || defined(HAIKU)
|
||||
# ifdef __STDC__
|
||||
typedef void (* SIG_PF)(int);
|
||||
# else
|
||||
typedef void (* SIG_PF)();
|
||||
# endif
|
||||
#endif /* SUNOS5SIGS || OSF1 || LINUX || HURD */
|
||||
#endif /* SUNOS5SIGS || OSF1 || LINUX || HURD || HAIKU */
|
||||
|
||||
#if defined(MSWIN32)
|
||||
typedef LPTOP_LEVEL_EXCEPTION_FILTER SIG_PF;
|
||||
@@ -2634,6 +2649,13 @@ SIG_PF GC_old_segv_handler; /* Also old MSWIN32 ACCESS_VIOLATION filter */
|
||||
/* architectures. */
|
||||
# endif /* LINUX */
|
||||
|
||||
# if defined(HAIKU)
|
||||
# include <errno.h>
|
||||
# define CODE_OK TRUE
|
||||
# define SIG_OK (sig == SIGSEGV)
|
||||
void GC_write_failt_handler(int sig, siginfo_t *scp, void * context)
|
||||
#endif /* HAIKU */
|
||||
|
||||
# if defined(SUNOS5SIGS)
|
||||
# ifdef __STDC__
|
||||
void GC_write_fault_handler(int sig, SIGINFO_T *scp, void * context)
|
||||
@@ -2679,7 +2701,7 @@ SIG_PF GC_old_segv_handler; /* Also old MSWIN32 ACCESS_VIOLATION filter */
|
||||
# if defined(OSF1) && defined(ALPHA)
|
||||
char * addr = (char *) (scp -> sc_traparg_a0);
|
||||
# endif
|
||||
# ifdef SUNOS5SIGS
|
||||
# if defined(SUNOS5SIGS) || defined(HAIKU)
|
||||
char * addr = (char *) (scp -> si_addr);
|
||||
# endif
|
||||
# ifdef LINUX
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
|
||||
#if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
|
||||
&& !defined(GC_IRIX_THREADS) && !defined(GC_WIN32_THREADS) \
|
||||
&& !defined(GC_DARWIN_THREADS) && !defined(GC_AIX_THREADS) \
|
||||
&& !defined(GC_OPENBSD_THREADS)
|
||||
&& !defined(GC_DARWIN_THREADS) && !defined(GC_AIX_THREADS)
|
||||
|
||||
#include <signal.h>
|
||||
#include <semaphore.h>
|
||||
|
||||
@@ -1135,7 +1135,7 @@ void GC_thr_init()
|
||||
# if defined(GC_HPUX_THREADS)
|
||||
GC_nprocs = pthread_num_processors_np();
|
||||
# endif
|
||||
# if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS)
|
||||
# if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) || defined(GC_HAIKU_THREADS)
|
||||
GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
|
||||
if (GC_nprocs <= 0) GC_nprocs = 1;
|
||||
# endif
|
||||
|
||||
@@ -13,6 +13,7 @@ man_MANS = \
|
||||
genxs.1 \
|
||||
httpcfg.1 \
|
||||
ilasm.1 \
|
||||
illinkanalyzer.1 \
|
||||
lc.1 \
|
||||
macpack.1 \
|
||||
makecert.1 \
|
||||
|
||||
@@ -1,41 +1,74 @@
|
||||
.TH illinkanalyzer 1
|
||||
.SH NAME
|
||||
illinkanalyzer \- Mono's linker analyzer tool
|
||||
.SH SYNOPSIS
|
||||
.B illinkanalyzer
|
||||
\fR[\fIoptions\fR] <\fIlinker-dependency-file.xml.gz\fR>
|
||||
.SH DESCRIPTION
|
||||
Linker analyzer is a command line tool to analyze dependencies, which
|
||||
were recorded during linker processing, and led linker to mark an item
|
||||
to keep it in the resulting linked assembly.
|
||||
|
||||
.PP
|
||||
It works on an oriented graph of dependencies, which are collected and
|
||||
dumped during the linker run. The vertices of this graph are the items
|
||||
of interest like assemblies, types, methods, fields, linker steps,
|
||||
etc. The edges represent the dependencies.
|
||||
|
||||
How to dump dependencies
|
||||
------------------------
|
||||
|
||||
.SH HOW TO DUMP DEPENDENCIES
|
||||
The linker analyzer needs a linker dependencies file as an input. It
|
||||
can be retrieved by enabling dependencies dumping during linking of a
|
||||
Xamarin.Android or a Xamarin.iOS project.
|
||||
|
||||
That can be done on the command line by setting
|
||||
`LinkerDumpDependencies` property to `true` and building the
|
||||
project. (make sure the LinkAssemblies task is called, it might
|
||||
require cleaning the project sometimes) Usually it is enough to build
|
||||
the project like this:
|
||||
|
||||
```msbuild /p:LinkerDumpDependencies=true /p:Configuration=Release YourAppProject.csproj```
|
||||
|
||||
.PP
|
||||
That can be done on the command line by setting LinkerDumpDependencies
|
||||
property to true and building the project. (make sure the
|
||||
LinkAssemblies task is called, it might require cleaning the project
|
||||
sometimes) Usually it is enough to build the project like this:
|
||||
.PP
|
||||
.nf
|
||||
.RS
|
||||
rm -f obj/Release/link.flag
|
||||
msbuild /p:LinkerDumpDependencies=true /p:Configuration=Release YourAppProject.csproj
|
||||
.RE
|
||||
.fi
|
||||
.PP
|
||||
After a successful build, there will be a linker-dependencies.xml.gz
|
||||
file created, containing the information for the analyzer.
|
||||
|
||||
How to use the analyzer
|
||||
-----------------------
|
||||
|
||||
.SH OPTIONS
|
||||
.nf
|
||||
.RS
|
||||
-a, --alldeps show all dependencies
|
||||
--csvoutput=VALUE outputs types and optionally size analysis to CSV
|
||||
file
|
||||
-h, --help show this message and exit.
|
||||
-l, --linkedpath=VALUE sets the linked assemblies directory path. Enables
|
||||
displaying size estimates.
|
||||
-r, --rawdeps=VALUE show raw vertex dependencies. Raw vertex VALUE is
|
||||
in the raw format written by linker to the
|
||||
dependency XML file. VALUE can be regular
|
||||
expression
|
||||
--roots show root dependencies.
|
||||
--stat show statistic of loaded dependencies.
|
||||
--tree reduce the dependency graph to the tree.
|
||||
--types show all types dependencies.
|
||||
-t, --typedeps=VALUE show type dependencies. The VALUE can be regular
|
||||
expression
|
||||
-f, --flat show all dependencies per vertex and their distance
|
||||
-v, --verbose be more verbose. Enables stat and roots options.
|
||||
.RE
|
||||
.fi
|
||||
.SH EXAMPLES
|
||||
Let say you would like to know, why a type, Android.App.Activity for
|
||||
example, was marked by the linker. So run the analyzer like this:
|
||||
|
||||
```mono linkeranalyzer.exe -t Android.App.Activity linker-dependencies.xml.gz```
|
||||
|
||||
.PP
|
||||
.nf
|
||||
.RS
|
||||
illinkanalyzer -t Android.App.Activity linker-dependencies.xml.gz
|
||||
.fi
|
||||
.RE
|
||||
.PP
|
||||
Output:
|
||||
|
||||
```
|
||||
.PP
|
||||
.nf
|
||||
.RS
|
||||
Loading dependency tree from: linker-dependencies.xml.gz
|
||||
|
||||
--- Type dependencies: 'Android.App.Activity' -----------------------
|
||||
@@ -46,34 +79,38 @@ Dependency #1
|
||||
| TypeDef:XA.App.MainActivity [2 deps]
|
||||
| Assembly:XA.App, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null [3 deps]
|
||||
| Other:Mono.Linker.Steps.ResolveFromAssemblyStep
|
||||
```
|
||||
|
||||
.fi
|
||||
.RE
|
||||
.PP
|
||||
The output contains dependencies string(s), starting with the type and
|
||||
continuing with the item of interest, which depends on the type. The
|
||||
dependency could be result of multiple reasons. For example the type
|
||||
was referenced from a method, or the type was listed in the linker xml
|
||||
file to be protected.
|
||||
|
||||
In our example there is only one dependency string called `Dependency
|
||||
#1`. It shows us that the type `Android.App.Activity` was marked
|
||||
during processing of type `XA.App.MainActivity` by the linker. In this
|
||||
case because the `MainActivity` type is based on the `Activity` type
|
||||
and thus the linker marked it and kept it in the linked assembly. We
|
||||
can also see that there are 2 dependencies for the `MainActivity`
|
||||
class. Note that in the string (above) we see only 1st dependency of
|
||||
the 2, the dependency on the assembly `XA.App`. And finally the
|
||||
assembly vertex depends on the `ResolveFromAssemblyStep` vertex. So we
|
||||
see that the assembly was processed in the `ResolveFromAssembly`
|
||||
linker step.
|
||||
|
||||
Now we might want to see the `MainActivity` dependencies. That could
|
||||
be done by the following analyzer run:
|
||||
|
||||
```mono linkeranalyzer.exe -r TypeDef:XA.App.MainActivity linker-dependencies.xml.gz```
|
||||
|
||||
.PP
|
||||
In our example there is only one dependency string called Dependency
|
||||
#1. It shows us that the type Android.App.Activity was marked during
|
||||
processing of type XA.App.MainActivity by the linker. In this case
|
||||
because the MainActivity type is based on the Activity type and thus
|
||||
the linker marked it and kept it in the linked assembly. We can also
|
||||
see that there are 2 dependencies for the MainActivity class. Note
|
||||
that in the string (above) we see only 1st dependency of the 2, the
|
||||
dependency on the assembly XA.App. And finally the assembly vertex
|
||||
depends on the ResolveFromAssemblyStep vertex. So we see that the
|
||||
assembly was processed in the ResolveFromAssembly linker step.
|
||||
.PP
|
||||
Now we might want to see the MainActivity dependencies. That could be done by the following analyzer run:
|
||||
.PP
|
||||
.nf
|
||||
.RS
|
||||
illinkanalyzer -r TypeDef:XA.App.MainActivity linker-dependencies.xml.gz
|
||||
.fi
|
||||
.RE
|
||||
.PP
|
||||
Output:
|
||||
|
||||
```
|
||||
.PP
|
||||
.nf
|
||||
.RS
|
||||
Loading dependency tree from: linker-dependencies.xml.gz
|
||||
|
||||
--- Raw dependencies: 'TypeDef:XA.App.MainActivity' -----------------
|
||||
@@ -89,37 +126,7 @@ Dependency #2
|
||||
| TypeDef:XA.App.MainActivity [2 deps]
|
||||
| Assembly:XA.App, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null [3 deps]
|
||||
| Other:Mono.Linker.Steps.ResolveFromAssemblyStep
|
||||
```
|
||||
|
||||
Known issues
|
||||
------------
|
||||
|
||||
Sometimes the linker processing is not straight forward and the
|
||||
marking is postponed, like processing of some of the methods. They are
|
||||
queued to be processed later. In such case the dependencies are
|
||||
"interrupted" and the dependecy string for the method usually shows
|
||||
just dependency on the Mark step.
|
||||
|
||||
Command line help
|
||||
-----------------
|
||||
```
|
||||
Usage:
|
||||
|
||||
linkeranalyzer [Options] <linker-dependency-file.xml.gz>
|
||||
|
||||
Options:
|
||||
|
||||
-a, --alldeps show all dependencies
|
||||
-h, --help show this message and exit.
|
||||
-r, --rawdeps=VALUE show raw vertex dependencies. Raw vertex VALUE is
|
||||
in the raw format written by linker to the
|
||||
dependency XML file. VALUE can be regular
|
||||
expression
|
||||
--roots show root dependencies.
|
||||
--stat show statistic of loaded dependencies.
|
||||
--tree reduce the dependency graph to the tree.
|
||||
--types show all types dependencies.
|
||||
-t, --typedeps=VALUE show type dependencies. The VALUE can be regular
|
||||
expression
|
||||
-v, --verbose be more verbose. Enables stat and roots options.
|
||||
```
|
||||
.fi
|
||||
.RE
|
||||
.SH SEE ALSO
|
||||
\fBmsbuild\fR(1)
|
||||
+1
-1
@@ -202,7 +202,7 @@ Specify a parameter for a custom step.
|
||||
.SH COPYRIGHT
|
||||
Copyright (C) 2007 Novell, Inc (http://www.novell.com)
|
||||
.SH BUGS
|
||||
Bugs report are welcome at http://bugzilla.xamarin.com
|
||||
Bugs report are welcome at https://github.com/mono/linker/issues
|
||||
.PP
|
||||
Product Mono Tools, Component linker.
|
||||
.SH MAILING LISTS
|
||||
|
||||
+2
-2
@@ -515,10 +515,10 @@ The Mono SQL Query Tool is released under the terms of the GNU GPL.
|
||||
Please read the accompanying `COPYING' file for details. Alternative
|
||||
licenses are available from Novell or Daniel Morgan.
|
||||
.SH BUGS
|
||||
To report bugs in the compiler, you can use `bug-buddy', or you can
|
||||
To report bugs in the compiler, you can
|
||||
file bug reports in our bug tracking system:
|
||||
.nf
|
||||
http://bugzilla.xamarin.com.
|
||||
https://github.com/mono/mono/issues
|
||||
.fi
|
||||
.PP
|
||||
.SH MAILING LISTS
|
||||
|
||||
@@ -42,7 +42,7 @@ class X {
|
||||
|
||||
Version min_mono_version;
|
||||
#if __MonoCS__
|
||||
min_mono_version = new Version (5, 9);
|
||||
min_mono_version = new Version (5, 11);
|
||||
#else
|
||||
min_mono_version = new Version (4, 9);
|
||||
#endif
|
||||
|
||||
@@ -37,7 +37,7 @@ LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/class/lib/$(PROFILE
|
||||
else
|
||||
|
||||
ifdef API_BIN_REFS
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/../external/api-snapshot/profiles/$(API_BIN_PROFILE)/%.dll,$(API_BIN_REFS))
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(API_BIN_PROFILE)/%.dll,$(API_BIN_REFS))
|
||||
endif
|
||||
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_FULL))
|
||||
@@ -388,5 +388,11 @@ $(the_libdir)/.doc-stamp: $(the_lib)
|
||||
gen-deps:
|
||||
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
|
||||
|
||||
update-corefx-sr: $(RESX_RESOURCE_STRING)
|
||||
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_RESOURCE_STRING) >corefx/SR.cs
|
||||
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)
|
||||
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
|
||||
@@ -31,7 +31,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES)
|
||||
API_BIN_PROFILE = net_4_x
|
||||
API_BIN_PROFILE = v4.7.1
|
||||
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
NO_TEST = yes
|
||||
|
||||
@@ -15,7 +15,7 @@ profile-check:
|
||||
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES)
|
||||
API_BIN_PROFILE = net_4_x
|
||||
API_BIN_PROFILE = v4.7.1
|
||||
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
NO_TEST = yes
|
||||
|
||||
@@ -27,7 +27,7 @@ PROFILE_MCS_FLAGS = \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = monodroid
|
||||
API_BIN_PROFILE = build/monodroid
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
# the tuner takes care of the install
|
||||
|
||||
@@ -28,7 +28,7 @@ PROFILE_MCS_FLAGS = \
|
||||
$(PLATFORM_DEBUG_FLAGS) \
|
||||
$(MONOTOUCH_MCS_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = monotouch
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
# This is utility build only
|
||||
|
||||
@@ -14,7 +14,7 @@ profile-check:
|
||||
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
API_BIN_PROFILE = net_4_x
|
||||
API_BIN_PROFILE = v4.7.1
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
XBUILD_VERSION = 4.0
|
||||
|
||||
@@ -29,7 +29,7 @@ PROFILE_MCS_FLAGS = \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = monotouch
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
# the tuner takes care of the install
|
||||
|
||||
@@ -28,7 +28,7 @@ PROFILE_MCS_FLAGS = \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = monotouch
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
# the tuner takes care of the install
|
||||
|
||||
@@ -25,7 +25,7 @@ PROFILE_MCS_FLAGS = \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = monotouch
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
NO_INSTALL = yes
|
||||
|
||||
@@ -25,7 +25,7 @@ PROFILE_MCS_FLAGS = \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = monotouch
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
NO_INSTALL = yes
|
||||
|
||||
@@ -29,7 +29,7 @@ PROFILE_MCS_FLAGS = \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = monotouch
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
# the tuner takes care of the install
|
||||
|
||||
@@ -29,7 +29,7 @@ PROFILE_MCS_FLAGS = \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = monotouch
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
# the tuner takes care of the install
|
||||
|
||||
@@ -27,7 +27,7 @@ PROFILE_MCS_FLAGS = \
|
||||
$(PLATFORM_DEBUG_FLAGS) \
|
||||
$(XAMMAC_MCS_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = monotouch
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
+11
-8
@@ -288,6 +288,15 @@ dist-recursive: dist-local
|
||||
(cd $$d && $(MAKE) distdir=$$reldir/$$d $@) || exit 1 ; \
|
||||
done
|
||||
|
||||
# function to dist files in groups of 100 entries to make sure we don't exceed shell char limits
|
||||
define distfilesingroups
|
||||
for f in $(wordlist 1, 100, $(1)) ; do \
|
||||
dest=`dirname "$(distdir)/$$f"` ; \
|
||||
$(MKINSTALLDIRS) $$dest && cp -p "$$f" $$dest || exit 1 ; \
|
||||
done
|
||||
$(if $(word 101, $(1)), $(call distfilesingroups, $(wordlist 101, $(words $(1)), $(1))))
|
||||
endef
|
||||
|
||||
# The following target can be used like
|
||||
#
|
||||
# dist-local: dist-default
|
||||
@@ -296,17 +305,11 @@ dist-recursive: dist-local
|
||||
# Notes:
|
||||
# 1. we invert the test here to not end in an error if ChangeLog doesn't exist.
|
||||
# 2. we error out if we try to dist a nonexistant file.
|
||||
# 3. we pick up Makefile, makefile, or GNUmakefile.
|
||||
# 3. we pick up Makefile
|
||||
dist-default:
|
||||
-mkdir -p $(distdir)
|
||||
test '!' -f ChangeLog || cp ChangeLog $(distdir)
|
||||
if test -f Makefile; then m=M; fi; \
|
||||
if test -f makefile; then m=m; fi; \
|
||||
if test -f GNUmakefile; then m=GNUm; fi; \
|
||||
for f in $${m}akefile $(DISTFILES) ; do \
|
||||
dest=`dirname "$(distdir)/$$f"` ; \
|
||||
$(MKINSTALLDIRS) $$dest && cp -p "$$f" $$dest || exit 1 ; \
|
||||
done
|
||||
$(call distfilesingroups, Makefile $(DISTFILES))
|
||||
if test -d Documentation ; then \
|
||||
find . -name '*.xml' > .files ; \
|
||||
tar cTf .files - | (cd $(distdir); tar xf -) ; \
|
||||
|
||||
+16
-5
@@ -20,9 +20,15 @@ TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
|
||||
ifndef NO_TEST
|
||||
|
||||
test_nunit_lib = nunitlite.dll
|
||||
xunit_core := xunit.core xunit.abstractions xunit.assert Xunit.NetCore.Extensions
|
||||
xunit_core := xunit.core xunit.execution.desktop xunit.abstractions xunit.assert Xunit.NetCore.Extensions
|
||||
xunit_deps := System.Runtime
|
||||
xunit_src := $(patsubst %,$(topdir)/../external/xunit-binaries/%,BenchmarkAttribute.cs BenchmarkDiscover.cs) $(topdir)/../mcs/class/test-helpers/PlatformDetection.cs
|
||||
|
||||
ifeq ($(USE_XTEST_REMOTE_EXECUTOR), YES)
|
||||
XTEST_REMOTE_EXECUTOR = $(xunit_test_lib)_RemoteExecuter.exe
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/AdminHelper.cs $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/IO/FileCleanupTestBase.cs $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs $(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs
|
||||
endif
|
||||
|
||||
xunit_class_deps :=
|
||||
|
||||
xunit_libs_ref = $(patsubst %,-r:$(topdir)/../external/xunit-binaries/%.dll,$(xunit_core))
|
||||
@@ -54,6 +60,7 @@ test_makefrag = $(depsdir)/$(test_lib).makefrag
|
||||
test_flags = $(test_nunit_ref) $(TEST_MCS_FLAGS) $(TEST_LIB_MCS_FLAGS)
|
||||
ifndef NO_BUILD
|
||||
test_flags += -r:$(the_assembly)
|
||||
test_assembly_dep = $(the_assembly)
|
||||
endif
|
||||
tests_CLEAN_FILES += $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.dll) $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.pdb) $(test_response) $(test_makefrag)
|
||||
|
||||
@@ -64,7 +71,7 @@ xunit_test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xunit-test.dll)
|
||||
|
||||
xtest_response = $(depsdir)/$(xunit_test_lib).response
|
||||
xtest_makefrag = $(depsdir)/$(xunit_test_lib).makefrag
|
||||
xtest_flags = -r:$(the_assembly) $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LIB_MCS_FLAGS)
|
||||
xtest_flags = -r:$(the_assembly) $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LIB_MCS_FLAGS) /unsafe
|
||||
|
||||
ifeq ($(wildcard $(xtest_sourcefile)),)
|
||||
xtest_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
|
||||
@@ -108,7 +115,7 @@ run-test-local: run-test-lib
|
||||
run-test-ondotnet-local: run-test-ondotnet-lib
|
||||
|
||||
ifdef TEST_WITH_INTERPRETER
|
||||
TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotWorking,InterpreterNotWorking,CAS
|
||||
TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotWorking,NotWorkingRuntimeInterpreter,CAS
|
||||
else
|
||||
TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotWorking,CAS
|
||||
endif
|
||||
@@ -224,7 +231,7 @@ ifdef HAVE_CS_TESTS
|
||||
$(test_lib_dir):
|
||||
mkdir -p $@
|
||||
|
||||
$(test_lib_output): $(the_assembly) $(test_response) $(test_nunit_dep) $(test_lib_dir)
|
||||
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) $(test_lib_dir)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
|
||||
|
||||
test_response_preprocessed = $(test_response)_preprocessed
|
||||
@@ -275,13 +282,17 @@ xunit-test-local: $(xunit_test_lib)
|
||||
run-xunit-test-local: run-xunit-test-lib
|
||||
|
||||
# cp -rf is a HACK for xunit runner to require xunit.execution.desktop.dll file in local folder on .net only
|
||||
run-xunit-test-lib: xunit-test-local
|
||||
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)" $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) || ok=false; \
|
||||
$$ok
|
||||
@rm -f xunit.execution.desktop.dll
|
||||
|
||||
# Some xunit tests want to be executed in a separate process (see RemoteExecutorTestBase)
|
||||
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../mcs/class/test-helpers/RemoteExecutorConsoleApp.cs
|
||||
$(TEST_COMPILE) $(topdir)/../mcs/class/test-helpers/RemoteExecutorConsoleApp.cs -r:$(xunit_test_lib) $(xtest_flags) /debug-
|
||||
|
||||
$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response) $(xunit_src)
|
||||
|
||||
|
||||
@@ -33,10 +33,9 @@
|
||||
|
||||
/*
|
||||
|
||||
Well, there looks no jis.table source. Thus, it seems like it is
|
||||
generated from text files from Unicode Home Page such like
|
||||
ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0208.TXT
|
||||
However, it is non-normative and in Japan it is contains many problem.
|
||||
jis.table is generated from uni2tab.c, which requires CP932.TXT and
|
||||
Unihan.txt as input files. However, it is non-normative and in Japan it is
|
||||
contains many problem.
|
||||
|
||||
FIXME: Some characters such as 0xFF0B (wide "plus") are missing in
|
||||
that table.
|
||||
|
||||
@@ -161,6 +161,15 @@ namespace MonoTests.I18N.CJK
|
||||
AssertDecode ("Test/texts/japanese-utf8.txt", "Test/texts/japanese-932.txt", 932);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Bug28321 ()
|
||||
{
|
||||
var expected = "\u00D7\u00B4\u00B1\u00F7\u00B6\u00B0\u00A8\u00A7";
|
||||
var text = Manager.GetEncoding ("shift_jis").GetString (Convert.FromBase64String ("gX6BTIF9gYCB94GLgU6BmA=="));
|
||||
|
||||
Assert.AreEqual (expected, text);
|
||||
}
|
||||
|
||||
// EUC-JP
|
||||
|
||||
[Test]
|
||||
|
||||
Binary file not shown.
@@ -158,6 +158,10 @@ public sealed class Handlers
|
||||
"I18N.Rare.ENCibm500",
|
||||
"I18N.Rare.CP708",
|
||||
"I18N.Rare.ENCasmo_708",
|
||||
"I18N.Rare.CP737",
|
||||
"I18N.Rare.ENCibm_737",
|
||||
"I18N.Rare.CP775",
|
||||
"I18N.Rare.ENCibm_775",
|
||||
"I18N.Rare.CP852",
|
||||
"I18N.Rare.ENCibm852",
|
||||
"I18N.Rare.CP855",
|
||||
|
||||
@@ -0,0 +1,462 @@
|
||||
/*
|
||||
* CP737.cs - Greek (DOS) code page.
|
||||
*
|
||||
* Copyright (c) 2002 Southern Storm Software, Pty Ltd
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Generated from "ibm-737.ucm".
|
||||
|
||||
// WARNING: Modifying this file directly might be a bad idea.
|
||||
// You should edit the code generator tools/ucm2cp.c instead for your changes
|
||||
// to appear in all relevant classes.
|
||||
namespace I18N.Rare
|
||||
{
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP737 : ByteEncoding
|
||||
{
|
||||
public CP737()
|
||||
: base(737, ToChars, "Greek (DOS)",
|
||||
"ibm737", "ibm737", "ibm737",
|
||||
false, false, false, false, 1253)
|
||||
{}
|
||||
|
||||
private static readonly char[] ToChars = {
|
||||
'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005',
|
||||
'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B',
|
||||
'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011',
|
||||
'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017',
|
||||
'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D',
|
||||
'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023',
|
||||
'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029',
|
||||
'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F',
|
||||
'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035',
|
||||
'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B',
|
||||
'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041',
|
||||
'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047',
|
||||
'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D',
|
||||
'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053',
|
||||
'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059',
|
||||
'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F',
|
||||
'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065',
|
||||
'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B',
|
||||
'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071',
|
||||
'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077',
|
||||
'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D',
|
||||
'\u007E', '\u001A', '\u0391', '\u0392', '\u0393', '\u0394',
|
||||
'\u0395', '\u0396', '\u0397', '\u0398', '\u0399', '\u039A',
|
||||
'\u039B', '\u039C', '\u039D', '\u039E', '\u039F', '\u03A0',
|
||||
'\u03A1', '\u03A3', '\u03A4', '\u03A5', '\u03A6', '\u03A7',
|
||||
'\u03A8', '\u03A9', '\u03B1', '\u03B2', '\u03B3', '\u03B4',
|
||||
'\u03B5', '\u03B6', '\u03B7', '\u03B8', '\u03B9', '\u03BA',
|
||||
'\u03BB', '\u03BC', '\u03BD', '\u03BE', '\u03BF', '\u03C0',
|
||||
'\u03C1', '\u03C3', '\u03C2', '\u03C4', '\u03C5', '\u03C6',
|
||||
'\u03C7', '\u03C8', '\u2591', '\u2592', '\u2593', '\u2502',
|
||||
'\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563',
|
||||
'\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510',
|
||||
'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C',
|
||||
'\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566',
|
||||
'\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564',
|
||||
'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B',
|
||||
'\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C',
|
||||
'\u2590', '\u2580', '\u03C9', '\u03AC', '\u03AD', '\u03AE',
|
||||
'\u03CA', '\u03AF', '\u03CC', '\u03CD', '\u03CB', '\u03CE',
|
||||
'\u0386', '\u0388', '\u0389', '\u038A', '\u038C', '\u038E',
|
||||
'\u038F', '\u00B1', '\u2265', '\u2264', '\u03AA', '\u03AB',
|
||||
'\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A',
|
||||
'\u207F', '\u00B2', '\u25A0', '\u00A0',
|
||||
};
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public unsafe override int GetByteCountImpl (char* chars, int count)
|
||||
{
|
||||
if (this.EncoderFallback != null) {
|
||||
//Calculate byte count by actually doing encoding and discarding the data.
|
||||
return GetBytesImpl(chars, count, null, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public override int GetByteCount (String s)
|
||||
{
|
||||
if (this.EncoderFallback != null)
|
||||
{
|
||||
//Calculate byte count by actually doing encoding and discarding the data.
|
||||
unsafe
|
||||
{
|
||||
fixed (char *s_ptr = s)
|
||||
{
|
||||
return GetBytesImpl(s_ptr, s.Length, null, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//byte count equals character count because no EncoderFallback set
|
||||
return s.Length;
|
||||
}
|
||||
}
|
||||
|
||||
//ToBytes is just an alias for GetBytesImpl, but doesn't return byte count
|
||||
protected unsafe override void ToBytes(char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
//Calling ToBytes with null destination buffer doesn't make any sense
|
||||
if (bytes == null)
|
||||
throw new ArgumentNullException("bytes");
|
||||
GetBytesImpl(chars, charCount, bytes, byteCount);
|
||||
}
|
||||
|
||||
public unsafe override int GetBytesImpl (char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
int ch;
|
||||
int charIndex = 0;
|
||||
int byteIndex = 0;
|
||||
EncoderFallbackBuffer buffer = null;
|
||||
while (charCount > 0)
|
||||
{
|
||||
ch = (int)(chars[charIndex]);
|
||||
if(ch >= 26) switch(ch)
|
||||
{
|
||||
case 0x001B:
|
||||
case 0x001D:
|
||||
case 0x001E:
|
||||
case 0x001F:
|
||||
case 0x0020:
|
||||
case 0x0021:
|
||||
case 0x0022:
|
||||
case 0x0023:
|
||||
case 0x0024:
|
||||
case 0x0025:
|
||||
case 0x0026:
|
||||
case 0x0027:
|
||||
case 0x0028:
|
||||
case 0x0029:
|
||||
case 0x002A:
|
||||
case 0x002B:
|
||||
case 0x002C:
|
||||
case 0x002D:
|
||||
case 0x002E:
|
||||
case 0x002F:
|
||||
case 0x0030:
|
||||
case 0x0031:
|
||||
case 0x0032:
|
||||
case 0x0033:
|
||||
case 0x0034:
|
||||
case 0x0035:
|
||||
case 0x0036:
|
||||
case 0x0037:
|
||||
case 0x0038:
|
||||
case 0x0039:
|
||||
case 0x003A:
|
||||
case 0x003B:
|
||||
case 0x003C:
|
||||
case 0x003D:
|
||||
case 0x003E:
|
||||
case 0x003F:
|
||||
case 0x0040:
|
||||
case 0x0041:
|
||||
case 0x0042:
|
||||
case 0x0043:
|
||||
case 0x0044:
|
||||
case 0x0045:
|
||||
case 0x0046:
|
||||
case 0x0047:
|
||||
case 0x0048:
|
||||
case 0x0049:
|
||||
case 0x004A:
|
||||
case 0x004B:
|
||||
case 0x004C:
|
||||
case 0x004D:
|
||||
case 0x004E:
|
||||
case 0x004F:
|
||||
case 0x0050:
|
||||
case 0x0051:
|
||||
case 0x0052:
|
||||
case 0x0053:
|
||||
case 0x0054:
|
||||
case 0x0055:
|
||||
case 0x0056:
|
||||
case 0x0057:
|
||||
case 0x0058:
|
||||
case 0x0059:
|
||||
case 0x005A:
|
||||
case 0x005B:
|
||||
case 0x005C:
|
||||
case 0x005D:
|
||||
case 0x005E:
|
||||
case 0x005F:
|
||||
case 0x0060:
|
||||
case 0x0061:
|
||||
case 0x0062:
|
||||
case 0x0063:
|
||||
case 0x0064:
|
||||
case 0x0065:
|
||||
case 0x0066:
|
||||
case 0x0067:
|
||||
case 0x0068:
|
||||
case 0x0069:
|
||||
case 0x006A:
|
||||
case 0x006B:
|
||||
case 0x006C:
|
||||
case 0x006D:
|
||||
case 0x006E:
|
||||
case 0x006F:
|
||||
case 0x0070:
|
||||
case 0x0071:
|
||||
case 0x0072:
|
||||
case 0x0073:
|
||||
case 0x0074:
|
||||
case 0x0075:
|
||||
case 0x0076:
|
||||
case 0x0077:
|
||||
case 0x0078:
|
||||
case 0x0079:
|
||||
case 0x007A:
|
||||
case 0x007B:
|
||||
case 0x007C:
|
||||
case 0x007D:
|
||||
case 0x007E:
|
||||
break;
|
||||
case 0x001A: ch = 0x7F; break;
|
||||
case 0x001C: ch = 0x1A; break;
|
||||
case 0x007F: ch = 0x1C; break;
|
||||
case 0x00A0: ch = 0xFF; break;
|
||||
case 0x00A7: ch = 0x15; break;
|
||||
case 0x00B0: ch = 0xF8; break;
|
||||
case 0x00B1: ch = 0xF1; break;
|
||||
case 0x00B2: ch = 0xFD; break;
|
||||
case 0x00B6: ch = 0x14; break;
|
||||
case 0x00B7: ch = 0xFA; break;
|
||||
case 0x00F7: ch = 0xF6; break;
|
||||
case 0x0386: ch = 0xEA; break;
|
||||
case 0x0388: ch = 0xEB; break;
|
||||
case 0x0389: ch = 0xEC; break;
|
||||
case 0x038A: ch = 0xED; break;
|
||||
case 0x038C: ch = 0xEE; break;
|
||||
case 0x038E: ch = 0xEF; break;
|
||||
case 0x038F: ch = 0xF0; break;
|
||||
case 0x0391:
|
||||
case 0x0392:
|
||||
case 0x0393:
|
||||
case 0x0394:
|
||||
case 0x0395:
|
||||
case 0x0396:
|
||||
case 0x0397:
|
||||
case 0x0398:
|
||||
case 0x0399:
|
||||
case 0x039A:
|
||||
case 0x039B:
|
||||
case 0x039C:
|
||||
case 0x039D:
|
||||
case 0x039E:
|
||||
case 0x039F:
|
||||
case 0x03A0:
|
||||
case 0x03A1:
|
||||
ch -= 0x0311;
|
||||
break;
|
||||
case 0x03A3:
|
||||
case 0x03A4:
|
||||
case 0x03A5:
|
||||
case 0x03A6:
|
||||
case 0x03A7:
|
||||
case 0x03A8:
|
||||
case 0x03A9:
|
||||
ch -= 0x0312;
|
||||
break;
|
||||
case 0x03AA: ch = 0xF4; break;
|
||||
case 0x03AB: ch = 0xF5; break;
|
||||
case 0x03AC: ch = 0xE1; break;
|
||||
case 0x03AD: ch = 0xE2; break;
|
||||
case 0x03AE: ch = 0xE3; break;
|
||||
case 0x03AF: ch = 0xE5; break;
|
||||
case 0x03B1:
|
||||
case 0x03B2:
|
||||
case 0x03B3:
|
||||
case 0x03B4:
|
||||
case 0x03B5:
|
||||
case 0x03B6:
|
||||
case 0x03B7:
|
||||
case 0x03B8:
|
||||
case 0x03B9:
|
||||
case 0x03BA:
|
||||
case 0x03BB:
|
||||
case 0x03BC:
|
||||
case 0x03BD:
|
||||
case 0x03BE:
|
||||
case 0x03BF:
|
||||
case 0x03C0:
|
||||
case 0x03C1:
|
||||
ch -= 0x0319;
|
||||
break;
|
||||
case 0x03C2: ch = 0xAA; break;
|
||||
case 0x03C3: ch = 0xA9; break;
|
||||
case 0x03C4:
|
||||
case 0x03C5:
|
||||
case 0x03C6:
|
||||
case 0x03C7:
|
||||
case 0x03C8:
|
||||
ch -= 0x0319;
|
||||
break;
|
||||
case 0x03C9: ch = 0xE0; break;
|
||||
case 0x03CA: ch = 0xE4; break;
|
||||
case 0x03CB: ch = 0xE8; break;
|
||||
case 0x03CC: ch = 0xE6; break;
|
||||
case 0x03CD: ch = 0xE7; break;
|
||||
case 0x03CE: ch = 0xE9; break;
|
||||
case 0x03D5: ch = 0xAD; break;
|
||||
case 0x2022: ch = 0x07; break;
|
||||
case 0x203C: ch = 0x13; break;
|
||||
case 0x207F: ch = 0xFC; break;
|
||||
case 0x2190: ch = 0x1B; break;
|
||||
case 0x2191: ch = 0x18; break;
|
||||
case 0x2192: ch = 0x1A; break;
|
||||
case 0x2193: ch = 0x19; break;
|
||||
case 0x2194: ch = 0x1D; break;
|
||||
case 0x2195: ch = 0x12; break;
|
||||
case 0x21A8: ch = 0x17; break;
|
||||
case 0x2219: ch = 0xF9; break;
|
||||
case 0x221A: ch = 0xFB; break;
|
||||
case 0x221F: ch = 0x1C; break;
|
||||
case 0x2248: ch = 0xF7; break;
|
||||
case 0x2264: ch = 0xF3; break;
|
||||
case 0x2265: ch = 0xF2; break;
|
||||
case 0x2302: ch = 0x7F; break;
|
||||
case 0x2500: ch = 0xC4; break;
|
||||
case 0x2502: ch = 0xB3; break;
|
||||
case 0x250C: ch = 0xDA; break;
|
||||
case 0x2510: ch = 0xBF; break;
|
||||
case 0x2514: ch = 0xC0; break;
|
||||
case 0x2518: ch = 0xD9; break;
|
||||
case 0x251C: ch = 0xC3; break;
|
||||
case 0x2524: ch = 0xB4; break;
|
||||
case 0x252C: ch = 0xC2; break;
|
||||
case 0x2534: ch = 0xC1; break;
|
||||
case 0x253C: ch = 0xC5; break;
|
||||
case 0x2550: ch = 0xCD; break;
|
||||
case 0x2551: ch = 0xBA; break;
|
||||
case 0x2552: ch = 0xD5; break;
|
||||
case 0x2553: ch = 0xD6; break;
|
||||
case 0x2554: ch = 0xC9; break;
|
||||
case 0x2555: ch = 0xB8; break;
|
||||
case 0x2556: ch = 0xB7; break;
|
||||
case 0x2557: ch = 0xBB; break;
|
||||
case 0x2558: ch = 0xD4; break;
|
||||
case 0x2559: ch = 0xD3; break;
|
||||
case 0x255A: ch = 0xC8; break;
|
||||
case 0x255B: ch = 0xBE; break;
|
||||
case 0x255C: ch = 0xBD; break;
|
||||
case 0x255D: ch = 0xBC; break;
|
||||
case 0x255E: ch = 0xC6; break;
|
||||
case 0x255F: ch = 0xC7; break;
|
||||
case 0x2560: ch = 0xCC; break;
|
||||
case 0x2561: ch = 0xB5; break;
|
||||
case 0x2562: ch = 0xB6; break;
|
||||
case 0x2563: ch = 0xB9; break;
|
||||
case 0x2564: ch = 0xD1; break;
|
||||
case 0x2565: ch = 0xD2; break;
|
||||
case 0x2566: ch = 0xCB; break;
|
||||
case 0x2567: ch = 0xCF; break;
|
||||
case 0x2568: ch = 0xD0; break;
|
||||
case 0x2569: ch = 0xCA; break;
|
||||
case 0x256A: ch = 0xD8; break;
|
||||
case 0x256B: ch = 0xD7; break;
|
||||
case 0x256C: ch = 0xCE; break;
|
||||
case 0x2580: ch = 0xDF; break;
|
||||
case 0x2584: ch = 0xDC; break;
|
||||
case 0x2588: ch = 0xDB; break;
|
||||
case 0x258C: ch = 0xDD; break;
|
||||
case 0x2590: ch = 0xDE; break;
|
||||
case 0x2591: ch = 0xB0; break;
|
||||
case 0x2592: ch = 0xB1; break;
|
||||
case 0x2593: ch = 0xB2; break;
|
||||
case 0x25A0: ch = 0xFE; break;
|
||||
case 0x25AC: ch = 0x16; break;
|
||||
case 0x25B2: ch = 0x1E; break;
|
||||
case 0x25BA: ch = 0x10; break;
|
||||
case 0x25BC: ch = 0x1F; break;
|
||||
case 0x25C4: ch = 0x11; break;
|
||||
case 0x25CB: ch = 0x09; break;
|
||||
case 0x25D8: ch = 0x08; break;
|
||||
case 0x25D9: ch = 0x0A; break;
|
||||
case 0x263A: ch = 0x01; break;
|
||||
case 0x263B: ch = 0x02; break;
|
||||
case 0x263C: ch = 0x0F; break;
|
||||
case 0x2640: ch = 0x0C; break;
|
||||
case 0x2642: ch = 0x0B; break;
|
||||
case 0x2660: ch = 0x06; break;
|
||||
case 0x2663: ch = 0x05; break;
|
||||
case 0x2665: ch = 0x03; break;
|
||||
case 0x2666: ch = 0x04; break;
|
||||
case 0x266A: ch = 0x0D; break;
|
||||
case 0x266C: ch = 0x0E; break;
|
||||
case 0xFFE8: ch = 0xB3; break;
|
||||
case 0xFFE9: ch = 0x1B; break;
|
||||
case 0xFFEA: ch = 0x18; break;
|
||||
case 0xFFEB: ch = 0x1A; break;
|
||||
case 0xFFEC: ch = 0x19; break;
|
||||
case 0xFFED: ch = 0xFE; break;
|
||||
case 0xFFEE: ch = 0x09; break;
|
||||
default:
|
||||
{
|
||||
if(ch >= 0xFF01 && ch <= 0xFF5E)
|
||||
{
|
||||
ch -= 0xFEE0;
|
||||
}
|
||||
else
|
||||
{
|
||||
HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount);
|
||||
charIndex++;
|
||||
charCount--;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
//Write encoded byte to buffer, if buffer is defined and fallback was not used
|
||||
if (bytes != null)
|
||||
bytes[byteIndex] = (byte)ch;
|
||||
byteIndex++;
|
||||
byteCount--;
|
||||
charIndex++;
|
||||
charCount--;
|
||||
}
|
||||
return byteIndex;
|
||||
}
|
||||
}; // class CP737
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm737 : CP737
|
||||
{
|
||||
public ENCibm737() : base() {}
|
||||
|
||||
}; // class ENCibm737
|
||||
|
||||
}; // namespace I18N.Rare
|
||||
@@ -0,0 +1,451 @@
|
||||
/*
|
||||
* CP775.cs - Baltic (DOS) code page.
|
||||
*
|
||||
* Copyright (c) 2002 Southern Storm Software, Pty Ltd
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Generated from "ibm-775.ucm".
|
||||
|
||||
// WARNING: Modifying this file directly might be a bad idea.
|
||||
// You should edit the code generator tools/ucm2cp.c instead for your changes
|
||||
// to appear in all relevant classes.
|
||||
namespace I18N.Rare
|
||||
{
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP775 : ByteEncoding
|
||||
{
|
||||
public CP775()
|
||||
: base(775, ToChars, "Baltic (DOS)",
|
||||
"ibm775", "ibm775", "ibm775",
|
||||
false, false, false, false, 1257)
|
||||
{}
|
||||
|
||||
private static readonly char[] ToChars = {
|
||||
'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005',
|
||||
'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B',
|
||||
'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011',
|
||||
'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017',
|
||||
'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D',
|
||||
'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023',
|
||||
'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029',
|
||||
'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F',
|
||||
'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035',
|
||||
'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B',
|
||||
'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041',
|
||||
'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047',
|
||||
'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D',
|
||||
'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053',
|
||||
'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059',
|
||||
'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F',
|
||||
'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065',
|
||||
'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B',
|
||||
'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071',
|
||||
'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077',
|
||||
'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D',
|
||||
'\u007E', '\u001A', '\u0106', '\u00FC', '\u00E9', '\u0101',
|
||||
'\u00E4', '\u0123', '\u00E5', '\u0107', '\u0142', '\u0113',
|
||||
'\u0156', '\u0157', '\u012B', '\u0179', '\u00C4', '\u00C5',
|
||||
'\u00C9', '\u00E6', '\u00C6', '\u014D', '\u00F6', '\u0122',
|
||||
'\u00A2', '\u015A', '\u015B', '\u00D6', '\u00DC', '\u00F8',
|
||||
'\u00A3', '\u00D8', '\u00D7', '\u00A4', '\u0100', '\u012A',
|
||||
'\u00F3', '\u017B', '\u017C', '\u017A', '\u201D', '\u00A6',
|
||||
'\u00A9', '\u00AE', '\u00AC', '\u00BD', '\u00BC', '\u0141',
|
||||
'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502',
|
||||
'\u2524', '\u0104', '\u010C', '\u0118', '\u0116', '\u2563',
|
||||
'\u2551', '\u2557', '\u255D', '\u012E', '\u0160', '\u2510',
|
||||
'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C',
|
||||
'\u0172', '\u016A', '\u255A', '\u2554', '\u2569', '\u2566',
|
||||
'\u2560', '\u2550', '\u256C', '\u017D', '\u0105', '\u010D',
|
||||
'\u0119', '\u0117', '\u012F', '\u0161', '\u0173', '\u016B',
|
||||
'\u017E', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C',
|
||||
'\u2590', '\u2580', '\u00D3', '\u00DF', '\u014C', '\u0143',
|
||||
'\u00F5', '\u00D5', '\u00B5', '\u0144', '\u0136', '\u0137',
|
||||
'\u013B', '\u013C', '\u0146', '\u0112', '\u0145', '\u2019',
|
||||
'\u00AD', '\u00B1', '\u201C', '\u00BE', '\u00B6', '\u00A7',
|
||||
'\u00F7', '\u201E', '\u00B0', '\u2219', '\u00B7', '\u00B9',
|
||||
'\u00B3', '\u00B2', '\u25A0', '\u00A0',
|
||||
};
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public unsafe override int GetByteCountImpl (char* chars, int count)
|
||||
{
|
||||
if (this.EncoderFallback != null) {
|
||||
//Calculate byte count by actually doing encoding and discarding the data.
|
||||
return GetBytesImpl(chars, count, null, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public override int GetByteCount (String s)
|
||||
{
|
||||
if (this.EncoderFallback != null)
|
||||
{
|
||||
//Calculate byte count by actually doing encoding and discarding the data.
|
||||
unsafe
|
||||
{
|
||||
fixed (char *s_ptr = s)
|
||||
{
|
||||
return GetBytesImpl(s_ptr, s.Length, null, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//byte count equals character count because no EncoderFallback set
|
||||
return s.Length;
|
||||
}
|
||||
}
|
||||
|
||||
//ToBytes is just an alias for GetBytesImpl, but doesn't return byte count
|
||||
protected unsafe override void ToBytes(char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
//Calling ToBytes with null destination buffer doesn't make any sense
|
||||
if (bytes == null)
|
||||
throw new ArgumentNullException("bytes");
|
||||
GetBytesImpl(chars, charCount, bytes, byteCount);
|
||||
}
|
||||
|
||||
public unsafe override int GetBytesImpl (char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
int ch;
|
||||
int charIndex = 0;
|
||||
int byteIndex = 0;
|
||||
EncoderFallbackBuffer buffer = null;
|
||||
while (charCount > 0)
|
||||
{
|
||||
ch = (int)(chars[charIndex]);
|
||||
if(ch >= 26) switch(ch)
|
||||
{
|
||||
case 0x001B:
|
||||
case 0x001D:
|
||||
case 0x001E:
|
||||
case 0x001F:
|
||||
case 0x0020:
|
||||
case 0x0021:
|
||||
case 0x0022:
|
||||
case 0x0023:
|
||||
case 0x0024:
|
||||
case 0x0025:
|
||||
case 0x0026:
|
||||
case 0x0027:
|
||||
case 0x0028:
|
||||
case 0x0029:
|
||||
case 0x002A:
|
||||
case 0x002B:
|
||||
case 0x002C:
|
||||
case 0x002D:
|
||||
case 0x002E:
|
||||
case 0x002F:
|
||||
case 0x0030:
|
||||
case 0x0031:
|
||||
case 0x0032:
|
||||
case 0x0033:
|
||||
case 0x0034:
|
||||
case 0x0035:
|
||||
case 0x0036:
|
||||
case 0x0037:
|
||||
case 0x0038:
|
||||
case 0x0039:
|
||||
case 0x003A:
|
||||
case 0x003B:
|
||||
case 0x003C:
|
||||
case 0x003D:
|
||||
case 0x003E:
|
||||
case 0x003F:
|
||||
case 0x0040:
|
||||
case 0x0041:
|
||||
case 0x0042:
|
||||
case 0x0043:
|
||||
case 0x0044:
|
||||
case 0x0045:
|
||||
case 0x0046:
|
||||
case 0x0047:
|
||||
case 0x0048:
|
||||
case 0x0049:
|
||||
case 0x004A:
|
||||
case 0x004B:
|
||||
case 0x004C:
|
||||
case 0x004D:
|
||||
case 0x004E:
|
||||
case 0x004F:
|
||||
case 0x0050:
|
||||
case 0x0051:
|
||||
case 0x0052:
|
||||
case 0x0053:
|
||||
case 0x0054:
|
||||
case 0x0055:
|
||||
case 0x0056:
|
||||
case 0x0057:
|
||||
case 0x0058:
|
||||
case 0x0059:
|
||||
case 0x005A:
|
||||
case 0x005B:
|
||||
case 0x005C:
|
||||
case 0x005D:
|
||||
case 0x005E:
|
||||
case 0x005F:
|
||||
case 0x0060:
|
||||
case 0x0061:
|
||||
case 0x0062:
|
||||
case 0x0063:
|
||||
case 0x0064:
|
||||
case 0x0065:
|
||||
case 0x0066:
|
||||
case 0x0067:
|
||||
case 0x0068:
|
||||
case 0x0069:
|
||||
case 0x006A:
|
||||
case 0x006B:
|
||||
case 0x006C:
|
||||
case 0x006D:
|
||||
case 0x006E:
|
||||
case 0x006F:
|
||||
case 0x0070:
|
||||
case 0x0071:
|
||||
case 0x0072:
|
||||
case 0x0073:
|
||||
case 0x0074:
|
||||
case 0x0075:
|
||||
case 0x0076:
|
||||
case 0x0077:
|
||||
case 0x0078:
|
||||
case 0x0079:
|
||||
case 0x007A:
|
||||
case 0x007B:
|
||||
case 0x007C:
|
||||
case 0x007D:
|
||||
case 0x007E:
|
||||
break;
|
||||
case 0x001A: ch = 0x7F; break;
|
||||
case 0x001C: ch = 0x1A; break;
|
||||
case 0x007F: ch = 0x1C; break;
|
||||
case 0x00A0: ch = 0xFF; break;
|
||||
case 0x00A2: ch = 0x96; break;
|
||||
case 0x00A3: ch = 0x9C; break;
|
||||
case 0x00A4: ch = 0x9F; break;
|
||||
case 0x00A6: ch = 0xA7; break;
|
||||
case 0x00A7: ch = 0xF5; break;
|
||||
case 0x00A9: ch = 0xA8; break;
|
||||
case 0x00AB: ch = 0xAE; break;
|
||||
case 0x00AC: ch = 0xAA; break;
|
||||
case 0x00AD: ch = 0xF0; break;
|
||||
case 0x00AE: ch = 0xA9; break;
|
||||
case 0x00B0: ch = 0xF8; break;
|
||||
case 0x00B1: ch = 0xF1; break;
|
||||
case 0x00B2: ch = 0xFD; break;
|
||||
case 0x00B3: ch = 0xFC; break;
|
||||
case 0x00B5: ch = 0xE6; break;
|
||||
case 0x00B6: ch = 0xF4; break;
|
||||
case 0x00B7: ch = 0xFA; break;
|
||||
case 0x00B9: ch = 0xFB; break;
|
||||
case 0x00BB: ch = 0xAF; break;
|
||||
case 0x00BC: ch = 0xAC; break;
|
||||
case 0x00BD: ch = 0xAB; break;
|
||||
case 0x00BE: ch = 0xF3; break;
|
||||
case 0x00C4: ch = 0x8E; break;
|
||||
case 0x00C5: ch = 0x8F; break;
|
||||
case 0x00C6: ch = 0x92; break;
|
||||
case 0x00C9: ch = 0x90; break;
|
||||
case 0x00D3: ch = 0xE0; break;
|
||||
case 0x00D5: ch = 0xE5; break;
|
||||
case 0x00D6: ch = 0x99; break;
|
||||
case 0x00D7: ch = 0x9E; break;
|
||||
case 0x00D8: ch = 0x9D; break;
|
||||
case 0x00DC: ch = 0x9A; break;
|
||||
case 0x00DF: ch = 0xE1; break;
|
||||
case 0x00E4: ch = 0x84; break;
|
||||
case 0x00E5: ch = 0x86; break;
|
||||
case 0x00E6: ch = 0x91; break;
|
||||
case 0x00E9: ch = 0x82; break;
|
||||
case 0x00F3: ch = 0xA2; break;
|
||||
case 0x00F5: ch = 0xE4; break;
|
||||
case 0x00F6: ch = 0x94; break;
|
||||
case 0x00F7: ch = 0xF6; break;
|
||||
case 0x00F8: ch = 0x9B; break;
|
||||
case 0x00FC: ch = 0x81; break;
|
||||
case 0x0100: ch = 0xA0; break;
|
||||
case 0x0101: ch = 0x83; break;
|
||||
case 0x0104: ch = 0xB5; break;
|
||||
case 0x0105: ch = 0xD0; break;
|
||||
case 0x0106: ch = 0x80; break;
|
||||
case 0x0107: ch = 0x87; break;
|
||||
case 0x010C: ch = 0xB6; break;
|
||||
case 0x010D: ch = 0xD1; break;
|
||||
case 0x0112: ch = 0xED; break;
|
||||
case 0x0113: ch = 0x89; break;
|
||||
case 0x0116: ch = 0xB8; break;
|
||||
case 0x0117: ch = 0xD3; break;
|
||||
case 0x0118: ch = 0xB7; break;
|
||||
case 0x0119: ch = 0xD2; break;
|
||||
case 0x0122: ch = 0x95; break;
|
||||
case 0x0123: ch = 0x85; break;
|
||||
case 0x012A: ch = 0xA1; break;
|
||||
case 0x012B: ch = 0x8C; break;
|
||||
case 0x012E: ch = 0xBD; break;
|
||||
case 0x012F: ch = 0xD4; break;
|
||||
case 0x0136: ch = 0xE8; break;
|
||||
case 0x0137: ch = 0xE9; break;
|
||||
case 0x013B: ch = 0xEA; break;
|
||||
case 0x013C: ch = 0xEB; break;
|
||||
case 0x0141: ch = 0xAD; break;
|
||||
case 0x0142: ch = 0x88; break;
|
||||
case 0x0143: ch = 0xE3; break;
|
||||
case 0x0144: ch = 0xE7; break;
|
||||
case 0x0145: ch = 0xEE; break;
|
||||
case 0x0146: ch = 0xEC; break;
|
||||
case 0x014C: ch = 0xE2; break;
|
||||
case 0x014D: ch = 0x93; break;
|
||||
case 0x0156: ch = 0x8A; break;
|
||||
case 0x0157: ch = 0x8B; break;
|
||||
case 0x015A: ch = 0x97; break;
|
||||
case 0x015B: ch = 0x98; break;
|
||||
case 0x0160: ch = 0xBE; break;
|
||||
case 0x0161: ch = 0xD5; break;
|
||||
case 0x016A: ch = 0xC7; break;
|
||||
case 0x016B: ch = 0xD7; break;
|
||||
case 0x0172: ch = 0xC6; break;
|
||||
case 0x0173: ch = 0xD6; break;
|
||||
case 0x0179: ch = 0x8D; break;
|
||||
case 0x017A: ch = 0xA5; break;
|
||||
case 0x017B: ch = 0xA3; break;
|
||||
case 0x017C: ch = 0xA4; break;
|
||||
case 0x017D: ch = 0xCF; break;
|
||||
case 0x017E: ch = 0xD8; break;
|
||||
case 0x2019: ch = 0xEF; break;
|
||||
case 0x201C: ch = 0xF2; break;
|
||||
case 0x201D: ch = 0xA6; break;
|
||||
case 0x201E: ch = 0xF7; break;
|
||||
case 0x2022: ch = 0x07; break;
|
||||
case 0x203C: ch = 0x13; break;
|
||||
case 0x2190: ch = 0x1B; break;
|
||||
case 0x2191: ch = 0x18; break;
|
||||
case 0x2192: ch = 0x1A; break;
|
||||
case 0x2193: ch = 0x19; break;
|
||||
case 0x2194: ch = 0x1D; break;
|
||||
case 0x2195: ch = 0x12; break;
|
||||
case 0x21A8: ch = 0x17; break;
|
||||
case 0x2219: ch = 0xF9; break;
|
||||
case 0x221F: ch = 0x1C; break;
|
||||
case 0x2302: ch = 0x7F; break;
|
||||
case 0x2500: ch = 0xC4; break;
|
||||
case 0x2502: ch = 0xB3; break;
|
||||
case 0x250C: ch = 0xDA; break;
|
||||
case 0x2510: ch = 0xBF; break;
|
||||
case 0x2514: ch = 0xC0; break;
|
||||
case 0x2518: ch = 0xD9; break;
|
||||
case 0x251C: ch = 0xC3; break;
|
||||
case 0x2524: ch = 0xB4; break;
|
||||
case 0x252C: ch = 0xC2; break;
|
||||
case 0x2534: ch = 0xC1; break;
|
||||
case 0x253C: ch = 0xC5; break;
|
||||
case 0x2550: ch = 0xCD; break;
|
||||
case 0x2551: ch = 0xBA; break;
|
||||
case 0x2554: ch = 0xC9; break;
|
||||
case 0x2557: ch = 0xBB; break;
|
||||
case 0x255A: ch = 0xC8; break;
|
||||
case 0x255D: ch = 0xBC; break;
|
||||
case 0x2560: ch = 0xCC; break;
|
||||
case 0x2563: ch = 0xB9; break;
|
||||
case 0x2566: ch = 0xCB; break;
|
||||
case 0x2569: ch = 0xCA; break;
|
||||
case 0x256C: ch = 0xCE; break;
|
||||
case 0x2580: ch = 0xDF; break;
|
||||
case 0x2584: ch = 0xDC; break;
|
||||
case 0x2588: ch = 0xDB; break;
|
||||
case 0x258C: ch = 0xDD; break;
|
||||
case 0x2590: ch = 0xDE; break;
|
||||
case 0x2591: ch = 0xB0; break;
|
||||
case 0x2592: ch = 0xB1; break;
|
||||
case 0x2593: ch = 0xB2; break;
|
||||
case 0x25A0: ch = 0xFE; break;
|
||||
case 0x25AC: ch = 0x16; break;
|
||||
case 0x25B2: ch = 0x1E; break;
|
||||
case 0x25BA: ch = 0x10; break;
|
||||
case 0x25BC: ch = 0x1F; break;
|
||||
case 0x25C4: ch = 0x11; break;
|
||||
case 0x25CB: ch = 0x09; break;
|
||||
case 0x25D8: ch = 0x08; break;
|
||||
case 0x25D9: ch = 0x0A; break;
|
||||
case 0x263A: ch = 0x01; break;
|
||||
case 0x263B: ch = 0x02; break;
|
||||
case 0x263C: ch = 0x0F; break;
|
||||
case 0x2640: ch = 0x0C; break;
|
||||
case 0x2642: ch = 0x0B; break;
|
||||
case 0x2660: ch = 0x06; break;
|
||||
case 0x2663: ch = 0x05; break;
|
||||
case 0x2665: ch = 0x03; break;
|
||||
case 0x2666: ch = 0x04; break;
|
||||
case 0x266A: ch = 0x0D; break;
|
||||
case 0x266B: ch = 0x0E; break;
|
||||
case 0xFFE8: ch = 0xB3; break;
|
||||
case 0xFFE9: ch = 0x1B; break;
|
||||
case 0xFFEA: ch = 0x18; break;
|
||||
case 0xFFEB: ch = 0x1A; break;
|
||||
case 0xFFEC: ch = 0x19; break;
|
||||
case 0xFFED: ch = 0xFE; break;
|
||||
case 0xFFEE: ch = 0x09; break;
|
||||
default:
|
||||
{
|
||||
if(ch >= 0xFF01 && ch <= 0xFF5E)
|
||||
{
|
||||
ch -= 0xFEE0;
|
||||
}
|
||||
else
|
||||
{
|
||||
HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount);
|
||||
charIndex++;
|
||||
charCount--;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
//Write encoded byte to buffer, if buffer is defined and fallback was not used
|
||||
if (bytes != null)
|
||||
bytes[byteIndex] = (byte)ch;
|
||||
byteIndex++;
|
||||
byteCount--;
|
||||
charIndex++;
|
||||
charCount--;
|
||||
}
|
||||
return byteIndex;
|
||||
}
|
||||
}; // class CP775
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm775 : CP775
|
||||
{
|
||||
public ENCibm775() : base() {}
|
||||
|
||||
}; // class ENCibm775
|
||||
|
||||
}; // namespace I18N.Rare
|
||||
@@ -83,6 +83,8 @@
|
||||
<Compile Include="CP37.cs" />
|
||||
<Compile Include="CP500.cs" />
|
||||
<Compile Include="CP708.cs" />
|
||||
<Compile Include="CP737.cs" />
|
||||
<Compile Include="CP775.cs" />
|
||||
<Compile Include="CP852.cs" />
|
||||
<Compile Include="CP855.cs" />
|
||||
<Compile Include="CP857.cs" />
|
||||
|
||||
@@ -31,6 +31,8 @@ CP21025.cs
|
||||
CP37.cs
|
||||
CP500.cs
|
||||
CP708.cs
|
||||
CP737.cs
|
||||
CP775.cs
|
||||
CP852.cs
|
||||
CP855.cs
|
||||
CP857.cs
|
||||
|
||||
@@ -0,0 +1,411 @@
|
||||
# ***************************************************************************
|
||||
# *
|
||||
# * Copyright (C) 1995-2002, International Business Machines
|
||||
# * Corporation and others. All Rights Reserved.
|
||||
# *
|
||||
# ***************************************************************************
|
||||
#
|
||||
# File created by rptp2ucm (compiled on Dec 3 2002)
|
||||
# from source files 34B002E1.RPMAP100 and 02E134B0.TPMAP100
|
||||
#
|
||||
<code_set_name> "ibm-737_P100-1997"
|
||||
<char_name_mask> "AXXXX"
|
||||
<mb_cur_max> 1
|
||||
<mb_cur_min> 1
|
||||
<uconv_class> "SBCS"
|
||||
<subchar> \x7F
|
||||
<icu:charsetFamily> "ASCII"
|
||||
<icu:alias> "ibm-737_VSUB"
|
||||
|
||||
CHARMAP
|
||||
<U0000> \x00 |0
|
||||
<U0001> \x01 |0
|
||||
<U0002> \x02 |0
|
||||
<U0003> \x03 |0
|
||||
<U0004> \x04 |0
|
||||
<U0005> \x05 |0
|
||||
<U0006> \x06 |0
|
||||
<U0007> \x07 |0
|
||||
<U0008> \x08 |0
|
||||
<U0009> \x09 |0
|
||||
<U000A> \x0A |0
|
||||
<U000B> \x0B |0
|
||||
<U000C> \x0C |0
|
||||
<U000D> \x0D |0
|
||||
<U000E> \x0E |0
|
||||
<U000F> \x0F |0
|
||||
<U0010> \x10 |0
|
||||
<U0011> \x11 |0
|
||||
<U0012> \x12 |0
|
||||
<U0013> \x13 |0
|
||||
<U0014> \x14 |0
|
||||
<U0015> \x15 |0
|
||||
<U0016> \x16 |0
|
||||
<U0017> \x17 |0
|
||||
<U0018> \x18 |0
|
||||
<U0019> \x19 |0
|
||||
<U001A> \x7F |0
|
||||
<U001B> \x1B |0
|
||||
<U001C> \x1A |0
|
||||
<U001D> \x1D |0
|
||||
<U001E> \x1E |0
|
||||
<U001F> \x1F |0
|
||||
<U0020> \x20 |0
|
||||
<U0021> \x21 |0
|
||||
<U0022> \x22 |0
|
||||
<U0023> \x23 |0
|
||||
<U0024> \x24 |0
|
||||
<U0025> \x25 |0
|
||||
<U0026> \x26 |0
|
||||
<U0027> \x27 |0
|
||||
<U0028> \x28 |0
|
||||
<U0029> \x29 |0
|
||||
<U002A> \x2A |0
|
||||
<U002B> \x2B |0
|
||||
<U002C> \x2C |0
|
||||
<U002D> \x2D |0
|
||||
<U002E> \x2E |0
|
||||
<U002F> \x2F |0
|
||||
<U0030> \x30 |0
|
||||
<U0031> \x31 |0
|
||||
<U0032> \x32 |0
|
||||
<U0033> \x33 |0
|
||||
<U0034> \x34 |0
|
||||
<U0035> \x35 |0
|
||||
<U0036> \x36 |0
|
||||
<U0037> \x37 |0
|
||||
<U0038> \x38 |0
|
||||
<U0039> \x39 |0
|
||||
<U003A> \x3A |0
|
||||
<U003B> \x3B |0
|
||||
<U003C> \x3C |0
|
||||
<U003D> \x3D |0
|
||||
<U003E> \x3E |0
|
||||
<U003F> \x3F |0
|
||||
<U0040> \x40 |0
|
||||
<U0041> \x41 |0
|
||||
<U0042> \x42 |0
|
||||
<U0043> \x43 |0
|
||||
<U0044> \x44 |0
|
||||
<U0045> \x45 |0
|
||||
<U0046> \x46 |0
|
||||
<U0047> \x47 |0
|
||||
<U0048> \x48 |0
|
||||
<U0049> \x49 |0
|
||||
<U004A> \x4A |0
|
||||
<U004B> \x4B |0
|
||||
<U004C> \x4C |0
|
||||
<U004D> \x4D |0
|
||||
<U004E> \x4E |0
|
||||
<U004F> \x4F |0
|
||||
<U0050> \x50 |0
|
||||
<U0051> \x51 |0
|
||||
<U0052> \x52 |0
|
||||
<U0053> \x53 |0
|
||||
<U0054> \x54 |0
|
||||
<U0055> \x55 |0
|
||||
<U0056> \x56 |0
|
||||
<U0057> \x57 |0
|
||||
<U0058> \x58 |0
|
||||
<U0059> \x59 |0
|
||||
<U005A> \x5A |0
|
||||
<U005B> \x5B |0
|
||||
<U005C> \x5C |0
|
||||
<U005D> \x5D |0
|
||||
<U005E> \x5E |0
|
||||
<U005F> \x5F |0
|
||||
<U0060> \x60 |0
|
||||
<U0061> \x61 |0
|
||||
<U0062> \x62 |0
|
||||
<U0063> \x63 |0
|
||||
<U0064> \x64 |0
|
||||
<U0065> \x65 |0
|
||||
<U0066> \x66 |0
|
||||
<U0067> \x67 |0
|
||||
<U0068> \x68 |0
|
||||
<U0069> \x69 |0
|
||||
<U006A> \x6A |0
|
||||
<U006B> \x6B |0
|
||||
<U006C> \x6C |0
|
||||
<U006D> \x6D |0
|
||||
<U006E> \x6E |0
|
||||
<U006F> \x6F |0
|
||||
<U0070> \x70 |0
|
||||
<U0071> \x71 |0
|
||||
<U0072> \x72 |0
|
||||
<U0073> \x73 |0
|
||||
<U0074> \x74 |0
|
||||
<U0075> \x75 |0
|
||||
<U0076> \x76 |0
|
||||
<U0077> \x77 |0
|
||||
<U0078> \x78 |0
|
||||
<U0079> \x79 |0
|
||||
<U007A> \x7A |0
|
||||
<U007B> \x7B |0
|
||||
<U007C> \x7C |0
|
||||
<U007D> \x7D |0
|
||||
<U007E> \x7E |0
|
||||
<U007F> \x1C |0
|
||||
<U00A0> \xFF |0
|
||||
<U00A7> \x15 |1
|
||||
<U00B0> \xF8 |0
|
||||
<U00B1> \xF1 |0
|
||||
<U00B2> \xFD |0
|
||||
<U00B6> \x14 |1
|
||||
<U00B7> \xFA |0
|
||||
<U00F7> \xF6 |0
|
||||
<U0386> \xEA |0
|
||||
<U0388> \xEB |0
|
||||
<U0389> \xEC |0
|
||||
<U038A> \xED |0
|
||||
<U038C> \xEE |0
|
||||
<U038E> \xEF |0
|
||||
<U038F> \xF0 |0
|
||||
<U0391> \x80 |0
|
||||
<U0392> \x81 |0
|
||||
<U0393> \x82 |0
|
||||
<U0394> \x83 |0
|
||||
<U0395> \x84 |0
|
||||
<U0396> \x85 |0
|
||||
<U0397> \x86 |0
|
||||
<U0398> \x87 |0
|
||||
<U0399> \x88 |0
|
||||
<U039A> \x89 |0
|
||||
<U039B> \x8A |0
|
||||
<U039C> \x8B |0
|
||||
<U039D> \x8C |0
|
||||
<U039E> \x8D |0
|
||||
<U039F> \x8E |0
|
||||
<U03A0> \x8F |0
|
||||
<U03A1> \x90 |0
|
||||
<U03A3> \x91 |0
|
||||
<U03A4> \x92 |0
|
||||
<U03A5> \x93 |0
|
||||
<U03A6> \x94 |0
|
||||
<U03A7> \x95 |0
|
||||
<U03A8> \x96 |0
|
||||
<U03A9> \x97 |0
|
||||
<U03AA> \xF4 |0
|
||||
<U03AB> \xF5 |0
|
||||
<U03AC> \xE1 |0
|
||||
<U03AD> \xE2 |0
|
||||
<U03AE> \xE3 |0
|
||||
<U03AF> \xE5 |0
|
||||
<U03B1> \x98 |0
|
||||
<U03B2> \x99 |0
|
||||
<U03B3> \x9A |0
|
||||
<U03B4> \x9B |0
|
||||
<U03B5> \x9C |0
|
||||
<U03B6> \x9D |0
|
||||
<U03B7> \x9E |0
|
||||
<U03B8> \x9F |0
|
||||
<U03B9> \xA0 |0
|
||||
<U03BA> \xA1 |0
|
||||
<U03BB> \xA2 |0
|
||||
<U03BC> \xA3 |0
|
||||
<U03BD> \xA4 |0
|
||||
<U03BE> \xA5 |0
|
||||
<U03BF> \xA6 |0
|
||||
<U03C0> \xA7 |0
|
||||
<U03C1> \xA8 |0
|
||||
<U03C2> \xAA |0
|
||||
<U03C3> \xA9 |0
|
||||
<U03C4> \xAB |0
|
||||
<U03C5> \xAC |0
|
||||
<U03C6> \xAD |0
|
||||
<U03C7> \xAE |0
|
||||
<U03C8> \xAF |0
|
||||
<U03C9> \xE0 |0
|
||||
<U03CA> \xE4 |0
|
||||
<U03CB> \xE8 |0
|
||||
<U03CC> \xE6 |0
|
||||
<U03CD> \xE7 |0
|
||||
<U03CE> \xE9 |0
|
||||
<U03D5> \xAD |1
|
||||
<U2022> \x07 |1
|
||||
<U203C> \x13 |1
|
||||
<U207F> \xFC |0
|
||||
<U2190> \x1B |1
|
||||
<U2191> \x18 |1
|
||||
<U2192> \x1A |1
|
||||
<U2193> \x19 |1
|
||||
<U2194> \x1D |1
|
||||
<U2195> \x12 |1
|
||||
<U21A8> \x17 |1
|
||||
<U2219> \xF9 |0
|
||||
<U221A> \xFB |0
|
||||
<U221F> \x1C |1
|
||||
<U2248> \xF7 |0
|
||||
<U2264> \xF3 |0
|
||||
<U2265> \xF2 |0
|
||||
<U2302> \x7F |2
|
||||
<U2500> \xC4 |0
|
||||
<U2502> \xB3 |0
|
||||
<U250C> \xDA |0
|
||||
<U2510> \xBF |0
|
||||
<U2514> \xC0 |0
|
||||
<U2518> \xD9 |0
|
||||
<U251C> \xC3 |0
|
||||
<U2524> \xB4 |0
|
||||
<U252C> \xC2 |0
|
||||
<U2534> \xC1 |0
|
||||
<U253C> \xC5 |0
|
||||
<U2550> \xCD |0
|
||||
<U2551> \xBA |0
|
||||
<U2552> \xD5 |0
|
||||
<U2553> \xD6 |0
|
||||
<U2554> \xC9 |0
|
||||
<U2555> \xB8 |0
|
||||
<U2556> \xB7 |0
|
||||
<U2557> \xBB |0
|
||||
<U2558> \xD4 |0
|
||||
<U2559> \xD3 |0
|
||||
<U255A> \xC8 |0
|
||||
<U255B> \xBE |0
|
||||
<U255C> \xBD |0
|
||||
<U255D> \xBC |0
|
||||
<U255E> \xC6 |0
|
||||
<U255F> \xC7 |0
|
||||
<U2560> \xCC |0
|
||||
<U2561> \xB5 |0
|
||||
<U2562> \xB6 |0
|
||||
<U2563> \xB9 |0
|
||||
<U2564> \xD1 |0
|
||||
<U2565> \xD2 |0
|
||||
<U2566> \xCB |0
|
||||
<U2567> \xCF |0
|
||||
<U2568> \xD0 |0
|
||||
<U2569> \xCA |0
|
||||
<U256A> \xD8 |0
|
||||
<U256B> \xD7 |0
|
||||
<U256C> \xCE |0
|
||||
<U2580> \xDF |0
|
||||
<U2584> \xDC |0
|
||||
<U2588> \xDB |0
|
||||
<U258C> \xDD |0
|
||||
<U2590> \xDE |0
|
||||
<U2591> \xB0 |0
|
||||
<U2592> \xB1 |0
|
||||
<U2593> \xB2 |0
|
||||
<U25A0> \xFE |0
|
||||
<U25AC> \x16 |1
|
||||
<U25B2> \x1E |1
|
||||
<U25BA> \x10 |1
|
||||
<U25BC> \x1F |1
|
||||
<U25C4> \x11 |1
|
||||
<U25CB> \x09 |1
|
||||
<U25D8> \x08 |1
|
||||
<U25D9> \x0A |1
|
||||
<U263A> \x01 |1
|
||||
<U263B> \x02 |1
|
||||
<U263C> \x0F |1
|
||||
<U2640> \x0C |1
|
||||
<U2642> \x0B |1
|
||||
<U2660> \x06 |1
|
||||
<U2663> \x05 |1
|
||||
<U2665> \x03 |1
|
||||
<U2666> \x04 |1
|
||||
<U266A> \x0D |1
|
||||
<U266C> \x0E |1
|
||||
<UFF01> \x21 |1
|
||||
<UFF02> \x22 |1
|
||||
<UFF03> \x23 |1
|
||||
<UFF04> \x24 |1
|
||||
<UFF05> \x25 |1
|
||||
<UFF06> \x26 |1
|
||||
<UFF07> \x27 |1
|
||||
<UFF08> \x28 |1
|
||||
<UFF09> \x29 |1
|
||||
<UFF0A> \x2A |1
|
||||
<UFF0B> \x2B |1
|
||||
<UFF0C> \x2C |1
|
||||
<UFF0D> \x2D |1
|
||||
<UFF0E> \x2E |1
|
||||
<UFF0F> \x2F |1
|
||||
<UFF10> \x30 |1
|
||||
<UFF11> \x31 |1
|
||||
<UFF12> \x32 |1
|
||||
<UFF13> \x33 |1
|
||||
<UFF14> \x34 |1
|
||||
<UFF15> \x35 |1
|
||||
<UFF16> \x36 |1
|
||||
<UFF17> \x37 |1
|
||||
<UFF18> \x38 |1
|
||||
<UFF19> \x39 |1
|
||||
<UFF1A> \x3A |1
|
||||
<UFF1B> \x3B |1
|
||||
<UFF1C> \x3C |1
|
||||
<UFF1D> \x3D |1
|
||||
<UFF1E> \x3E |1
|
||||
<UFF1F> \x3F |1
|
||||
<UFF20> \x40 |1
|
||||
<UFF21> \x41 |1
|
||||
<UFF22> \x42 |1
|
||||
<UFF23> \x43 |1
|
||||
<UFF24> \x44 |1
|
||||
<UFF25> \x45 |1
|
||||
<UFF26> \x46 |1
|
||||
<UFF27> \x47 |1
|
||||
<UFF28> \x48 |1
|
||||
<UFF29> \x49 |1
|
||||
<UFF2A> \x4A |1
|
||||
<UFF2B> \x4B |1
|
||||
<UFF2C> \x4C |1
|
||||
<UFF2D> \x4D |1
|
||||
<UFF2E> \x4E |1
|
||||
<UFF2F> \x4F |1
|
||||
<UFF30> \x50 |1
|
||||
<UFF31> \x51 |1
|
||||
<UFF32> \x52 |1
|
||||
<UFF33> \x53 |1
|
||||
<UFF34> \x54 |1
|
||||
<UFF35> \x55 |1
|
||||
<UFF36> \x56 |1
|
||||
<UFF37> \x57 |1
|
||||
<UFF38> \x58 |1
|
||||
<UFF39> \x59 |1
|
||||
<UFF3A> \x5A |1
|
||||
<UFF3B> \x5B |1
|
||||
<UFF3C> \x5C |1
|
||||
<UFF3D> \x5D |1
|
||||
<UFF3E> \x5E |1
|
||||
<UFF3F> \x5F |1
|
||||
<UFF40> \x60 |1
|
||||
<UFF41> \x61 |1
|
||||
<UFF42> \x62 |1
|
||||
<UFF43> \x63 |1
|
||||
<UFF44> \x64 |1
|
||||
<UFF45> \x65 |1
|
||||
<UFF46> \x66 |1
|
||||
<UFF47> \x67 |1
|
||||
<UFF48> \x68 |1
|
||||
<UFF49> \x69 |1
|
||||
<UFF4A> \x6A |1
|
||||
<UFF4B> \x6B |1
|
||||
<UFF4C> \x6C |1
|
||||
<UFF4D> \x6D |1
|
||||
<UFF4E> \x6E |1
|
||||
<UFF4F> \x6F |1
|
||||
<UFF50> \x70 |1
|
||||
<UFF51> \x71 |1
|
||||
<UFF52> \x72 |1
|
||||
<UFF53> \x73 |1
|
||||
<UFF54> \x74 |1
|
||||
<UFF55> \x75 |1
|
||||
<UFF56> \x76 |1
|
||||
<UFF57> \x77 |1
|
||||
<UFF58> \x78 |1
|
||||
<UFF59> \x79 |1
|
||||
<UFF5A> \x7A |1
|
||||
<UFF5B> \x7B |1
|
||||
<UFF5C> \x7C |1
|
||||
<UFF5D> \x7D |1
|
||||
<UFF5E> \x7E |1
|
||||
<UFFE8> \xB3 |1
|
||||
<UFFE9> \x1B |1
|
||||
<UFFEA> \x18 |1
|
||||
<UFFEB> \x1A |1
|
||||
<UFFEC> \x19 |1
|
||||
<UFFED> \xFE |1
|
||||
<UFFEE> \x09 |1
|
||||
END CHARMAP
|
||||
@@ -0,0 +1,408 @@
|
||||
# ***************************************************************************
|
||||
# *
|
||||
# * Copyright (C) 1995-2004, International Business Machines
|
||||
# * Corporation and others. All Rights Reserved.
|
||||
# *
|
||||
# ***************************************************************************
|
||||
#
|
||||
# File created by rptp2ucm (compiled on Jan 14 2004)
|
||||
# from source files 34B00307.RPMAP100 and 030734B0.TPMAP100
|
||||
#
|
||||
<code_set_name> "ibm-775_P100-1996"
|
||||
<char_name_mask> "AXXXX"
|
||||
<mb_cur_max> 1
|
||||
<mb_cur_min> 1
|
||||
<uconv_class> "SBCS"
|
||||
<subchar> \x7F
|
||||
<icu:charsetFamily> "ASCII"
|
||||
<icu:alias> "ibm-775_VSUB"
|
||||
|
||||
CHARMAP
|
||||
<U0000> \x00 |0
|
||||
<U0001> \x01 |0
|
||||
<U0002> \x02 |0
|
||||
<U0003> \x03 |0
|
||||
<U0004> \x04 |0
|
||||
<U0005> \x05 |0
|
||||
<U0006> \x06 |0
|
||||
<U0007> \x07 |0
|
||||
<U0008> \x08 |0
|
||||
<U0009> \x09 |0
|
||||
<U000A> \x0A |0
|
||||
<U000B> \x0B |0
|
||||
<U000C> \x0C |0
|
||||
<U000D> \x0D |0
|
||||
<U000E> \x0E |0
|
||||
<U000F> \x0F |0
|
||||
<U0010> \x10 |0
|
||||
<U0011> \x11 |0
|
||||
<U0012> \x12 |0
|
||||
<U0013> \x13 |0
|
||||
<U0014> \x14 |0
|
||||
<U0015> \x15 |0
|
||||
<U0016> \x16 |0
|
||||
<U0017> \x17 |0
|
||||
<U0018> \x18 |0
|
||||
<U0019> \x19 |0
|
||||
<U001A> \x7F |0
|
||||
<U001B> \x1B |0
|
||||
<U001C> \x1A |0
|
||||
<U001D> \x1D |0
|
||||
<U001E> \x1E |0
|
||||
<U001F> \x1F |0
|
||||
<U0020> \x20 |0
|
||||
<U0021> \x21 |0
|
||||
<U0022> \x22 |0
|
||||
<U0023> \x23 |0
|
||||
<U0024> \x24 |0
|
||||
<U0025> \x25 |0
|
||||
<U0026> \x26 |0
|
||||
<U0027> \x27 |0
|
||||
<U0028> \x28 |0
|
||||
<U0029> \x29 |0
|
||||
<U002A> \x2A |0
|
||||
<U002B> \x2B |0
|
||||
<U002C> \x2C |0
|
||||
<U002D> \x2D |0
|
||||
<U002E> \x2E |0
|
||||
<U002F> \x2F |0
|
||||
<U0030> \x30 |0
|
||||
<U0031> \x31 |0
|
||||
<U0032> \x32 |0
|
||||
<U0033> \x33 |0
|
||||
<U0034> \x34 |0
|
||||
<U0035> \x35 |0
|
||||
<U0036> \x36 |0
|
||||
<U0037> \x37 |0
|
||||
<U0038> \x38 |0
|
||||
<U0039> \x39 |0
|
||||
<U003A> \x3A |0
|
||||
<U003B> \x3B |0
|
||||
<U003C> \x3C |0
|
||||
<U003D> \x3D |0
|
||||
<U003E> \x3E |0
|
||||
<U003F> \x3F |0
|
||||
<U0040> \x40 |0
|
||||
<U0041> \x41 |0
|
||||
<U0042> \x42 |0
|
||||
<U0043> \x43 |0
|
||||
<U0044> \x44 |0
|
||||
<U0045> \x45 |0
|
||||
<U0046> \x46 |0
|
||||
<U0047> \x47 |0
|
||||
<U0048> \x48 |0
|
||||
<U0049> \x49 |0
|
||||
<U004A> \x4A |0
|
||||
<U004B> \x4B |0
|
||||
<U004C> \x4C |0
|
||||
<U004D> \x4D |0
|
||||
<U004E> \x4E |0
|
||||
<U004F> \x4F |0
|
||||
<U0050> \x50 |0
|
||||
<U0051> \x51 |0
|
||||
<U0052> \x52 |0
|
||||
<U0053> \x53 |0
|
||||
<U0054> \x54 |0
|
||||
<U0055> \x55 |0
|
||||
<U0056> \x56 |0
|
||||
<U0057> \x57 |0
|
||||
<U0058> \x58 |0
|
||||
<U0059> \x59 |0
|
||||
<U005A> \x5A |0
|
||||
<U005B> \x5B |0
|
||||
<U005C> \x5C |0
|
||||
<U005D> \x5D |0
|
||||
<U005E> \x5E |0
|
||||
<U005F> \x5F |0
|
||||
<U0060> \x60 |0
|
||||
<U0061> \x61 |0
|
||||
<U0062> \x62 |0
|
||||
<U0063> \x63 |0
|
||||
<U0064> \x64 |0
|
||||
<U0065> \x65 |0
|
||||
<U0066> \x66 |0
|
||||
<U0067> \x67 |0
|
||||
<U0068> \x68 |0
|
||||
<U0069> \x69 |0
|
||||
<U006A> \x6A |0
|
||||
<U006B> \x6B |0
|
||||
<U006C> \x6C |0
|
||||
<U006D> \x6D |0
|
||||
<U006E> \x6E |0
|
||||
<U006F> \x6F |0
|
||||
<U0070> \x70 |0
|
||||
<U0071> \x71 |0
|
||||
<U0072> \x72 |0
|
||||
<U0073> \x73 |0
|
||||
<U0074> \x74 |0
|
||||
<U0075> \x75 |0
|
||||
<U0076> \x76 |0
|
||||
<U0077> \x77 |0
|
||||
<U0078> \x78 |0
|
||||
<U0079> \x79 |0
|
||||
<U007A> \x7A |0
|
||||
<U007B> \x7B |0
|
||||
<U007C> \x7C |0
|
||||
<U007D> \x7D |0
|
||||
<U007E> \x7E |0
|
||||
<U007F> \x1C |0
|
||||
<U00A0> \xFF |0
|
||||
<U00A2> \x96 |0
|
||||
<U00A3> \x9C |0
|
||||
<U00A4> \x9F |0
|
||||
<U00A6> \xA7 |0
|
||||
<U00A7> \xF5 |0
|
||||
<U00A9> \xA8 |0
|
||||
<U00AB> \xAE |0
|
||||
<U00AC> \xAA |0
|
||||
<U00AD> \xF0 |0
|
||||
<U00AE> \xA9 |0
|
||||
<U00B0> \xF8 |0
|
||||
<U00B1> \xF1 |0
|
||||
<U00B2> \xFD |0
|
||||
<U00B3> \xFC |0
|
||||
<U00B5> \xE6 |0
|
||||
<U00B6> \xF4 |0
|
||||
<U00B7> \xFA |0
|
||||
<U00B9> \xFB |0
|
||||
<U00BB> \xAF |0
|
||||
<U00BC> \xAC |0
|
||||
<U00BD> \xAB |0
|
||||
<U00BE> \xF3 |0
|
||||
<U00C4> \x8E |0
|
||||
<U00C5> \x8F |0
|
||||
<U00C6> \x92 |0
|
||||
<U00C9> \x90 |0
|
||||
<U00D3> \xE0 |0
|
||||
<U00D5> \xE5 |0
|
||||
<U00D6> \x99 |0
|
||||
<U00D7> \x9E |0
|
||||
<U00D8> \x9D |0
|
||||
<U00DC> \x9A |0
|
||||
<U00DF> \xE1 |0
|
||||
<U00E4> \x84 |0
|
||||
<U00E5> \x86 |0
|
||||
<U00E6> \x91 |0
|
||||
<U00E9> \x82 |0
|
||||
<U00F3> \xA2 |0
|
||||
<U00F5> \xE4 |0
|
||||
<U00F6> \x94 |0
|
||||
<U00F7> \xF6 |0
|
||||
<U00F8> \x9B |0
|
||||
<U00FC> \x81 |0
|
||||
<U0100> \xA0 |0
|
||||
<U0101> \x83 |0
|
||||
<U0104> \xB5 |0
|
||||
<U0105> \xD0 |0
|
||||
<U0106> \x80 |0
|
||||
<U0107> \x87 |0
|
||||
<U010C> \xB6 |0
|
||||
<U010D> \xD1 |0
|
||||
<U0112> \xED |0
|
||||
<U0113> \x89 |0
|
||||
<U0116> \xB8 |0
|
||||
<U0117> \xD3 |0
|
||||
<U0118> \xB7 |0
|
||||
<U0119> \xD2 |0
|
||||
<U0122> \x95 |0
|
||||
<U0123> \x85 |0
|
||||
<U012A> \xA1 |0
|
||||
<U012B> \x8C |0
|
||||
<U012E> \xBD |0
|
||||
<U012F> \xD4 |0
|
||||
<U0136> \xE8 |0
|
||||
<U0137> \xE9 |0
|
||||
<U013B> \xEA |0
|
||||
<U013C> \xEB |0
|
||||
<U0141> \xAD |0
|
||||
<U0142> \x88 |0
|
||||
<U0143> \xE3 |0
|
||||
<U0144> \xE7 |0
|
||||
<U0145> \xEE |0
|
||||
<U0146> \xEC |0
|
||||
<U014C> \xE2 |0
|
||||
<U014D> \x93 |0
|
||||
<U0156> \x8A |0
|
||||
<U0157> \x8B |0
|
||||
<U015A> \x97 |0
|
||||
<U015B> \x98 |0
|
||||
<U0160> \xBE |0
|
||||
<U0161> \xD5 |0
|
||||
<U016A> \xC7 |0
|
||||
<U016B> \xD7 |0
|
||||
<U0172> \xC6 |0
|
||||
<U0173> \xD6 |0
|
||||
<U0179> \x8D |0
|
||||
<U017A> \xA5 |0
|
||||
<U017B> \xA3 |0
|
||||
<U017C> \xA4 |0
|
||||
<U017D> \xCF |0
|
||||
<U017E> \xD8 |0
|
||||
<U2019> \xEF |0
|
||||
<U201C> \xF2 |0
|
||||
<U201D> \xA6 |0
|
||||
<U201E> \xF7 |0
|
||||
<U2022> \x07 |1
|
||||
<U203C> \x13 |1
|
||||
<U2190> \x1B |1
|
||||
<U2191> \x18 |1
|
||||
<U2192> \x1A |1
|
||||
<U2193> \x19 |1
|
||||
<U2194> \x1D |1
|
||||
<U2195> \x12 |1
|
||||
<U21A8> \x17 |1
|
||||
<U2219> \xF9 |0
|
||||
<U221F> \x1C |1
|
||||
<U2302> \x7F |2
|
||||
<U2500> \xC4 |0
|
||||
<U2502> \xB3 |0
|
||||
<U250C> \xDA |0
|
||||
<U2510> \xBF |0
|
||||
<U2514> \xC0 |0
|
||||
<U2518> \xD9 |0
|
||||
<U251C> \xC3 |0
|
||||
<U2524> \xB4 |0
|
||||
<U252C> \xC2 |0
|
||||
<U2534> \xC1 |0
|
||||
<U253C> \xC5 |0
|
||||
<U2550> \xCD |0
|
||||
<U2551> \xBA |0
|
||||
<U2554> \xC9 |0
|
||||
<U2557> \xBB |0
|
||||
<U255A> \xC8 |0
|
||||
<U255D> \xBC |0
|
||||
<U2560> \xCC |0
|
||||
<U2563> \xB9 |0
|
||||
<U2566> \xCB |0
|
||||
<U2569> \xCA |0
|
||||
<U256C> \xCE |0
|
||||
<U2580> \xDF |0
|
||||
<U2584> \xDC |0
|
||||
<U2588> \xDB |0
|
||||
<U258C> \xDD |0
|
||||
<U2590> \xDE |0
|
||||
<U2591> \xB0 |0
|
||||
<U2592> \xB1 |0
|
||||
<U2593> \xB2 |0
|
||||
<U25A0> \xFE |0
|
||||
<U25AC> \x16 |1
|
||||
<U25B2> \x1E |1
|
||||
<U25BA> \x10 |1
|
||||
<U25BC> \x1F |1
|
||||
<U25C4> \x11 |1
|
||||
<U25CB> \x09 |1
|
||||
<U25D8> \x08 |1
|
||||
<U25D9> \x0A |1
|
||||
<U263A> \x01 |1
|
||||
<U263B> \x02 |1
|
||||
<U263C> \x0F |1
|
||||
<U2640> \x0C |1
|
||||
<U2642> \x0B |1
|
||||
<U2660> \x06 |1
|
||||
<U2663> \x05 |1
|
||||
<U2665> \x03 |1
|
||||
<U2666> \x04 |1
|
||||
<U266A> \x0D |1
|
||||
<U266B> \x0E |1
|
||||
<UFF01> \x21 |1
|
||||
<UFF02> \x22 |1
|
||||
<UFF03> \x23 |1
|
||||
<UFF04> \x24 |1
|
||||
<UFF05> \x25 |1
|
||||
<UFF06> \x26 |1
|
||||
<UFF07> \x27 |1
|
||||
<UFF08> \x28 |1
|
||||
<UFF09> \x29 |1
|
||||
<UFF0A> \x2A |1
|
||||
<UFF0B> \x2B |1
|
||||
<UFF0C> \x2C |1
|
||||
<UFF0D> \x2D |1
|
||||
<UFF0E> \x2E |1
|
||||
<UFF0F> \x2F |1
|
||||
<UFF10> \x30 |1
|
||||
<UFF11> \x31 |1
|
||||
<UFF12> \x32 |1
|
||||
<UFF13> \x33 |1
|
||||
<UFF14> \x34 |1
|
||||
<UFF15> \x35 |1
|
||||
<UFF16> \x36 |1
|
||||
<UFF17> \x37 |1
|
||||
<UFF18> \x38 |1
|
||||
<UFF19> \x39 |1
|
||||
<UFF1A> \x3A |1
|
||||
<UFF1B> \x3B |1
|
||||
<UFF1C> \x3C |1
|
||||
<UFF1D> \x3D |1
|
||||
<UFF1E> \x3E |1
|
||||
<UFF1F> \x3F |1
|
||||
<UFF20> \x40 |1
|
||||
<UFF21> \x41 |1
|
||||
<UFF22> \x42 |1
|
||||
<UFF23> \x43 |1
|
||||
<UFF24> \x44 |1
|
||||
<UFF25> \x45 |1
|
||||
<UFF26> \x46 |1
|
||||
<UFF27> \x47 |1
|
||||
<UFF28> \x48 |1
|
||||
<UFF29> \x49 |1
|
||||
<UFF2A> \x4A |1
|
||||
<UFF2B> \x4B |1
|
||||
<UFF2C> \x4C |1
|
||||
<UFF2D> \x4D |1
|
||||
<UFF2E> \x4E |1
|
||||
<UFF2F> \x4F |1
|
||||
<UFF30> \x50 |1
|
||||
<UFF31> \x51 |1
|
||||
<UFF32> \x52 |1
|
||||
<UFF33> \x53 |1
|
||||
<UFF34> \x54 |1
|
||||
<UFF35> \x55 |1
|
||||
<UFF36> \x56 |1
|
||||
<UFF37> \x57 |1
|
||||
<UFF38> \x58 |1
|
||||
<UFF39> \x59 |1
|
||||
<UFF3A> \x5A |1
|
||||
<UFF3B> \x5B |1
|
||||
<UFF3C> \x5C |1
|
||||
<UFF3D> \x5D |1
|
||||
<UFF3E> \x5E |1
|
||||
<UFF3F> \x5F |1
|
||||
<UFF40> \x60 |1
|
||||
<UFF41> \x61 |1
|
||||
<UFF42> \x62 |1
|
||||
<UFF43> \x63 |1
|
||||
<UFF44> \x64 |1
|
||||
<UFF45> \x65 |1
|
||||
<UFF46> \x66 |1
|
||||
<UFF47> \x67 |1
|
||||
<UFF48> \x68 |1
|
||||
<UFF49> \x69 |1
|
||||
<UFF4A> \x6A |1
|
||||
<UFF4B> \x6B |1
|
||||
<UFF4C> \x6C |1
|
||||
<UFF4D> \x6D |1
|
||||
<UFF4E> \x6E |1
|
||||
<UFF4F> \x6F |1
|
||||
<UFF50> \x70 |1
|
||||
<UFF51> \x71 |1
|
||||
<UFF52> \x72 |1
|
||||
<UFF53> \x73 |1
|
||||
<UFF54> \x74 |1
|
||||
<UFF55> \x75 |1
|
||||
<UFF56> \x76 |1
|
||||
<UFF57> \x77 |1
|
||||
<UFF58> \x78 |1
|
||||
<UFF59> \x79 |1
|
||||
<UFF5A> \x7A |1
|
||||
<UFF5B> \x7B |1
|
||||
<UFF5C> \x7C |1
|
||||
<UFF5D> \x7D |1
|
||||
<UFF5E> \x7E |1
|
||||
<UFFE8> \xB3 |1
|
||||
<UFFE9> \x1B |1
|
||||
<UFFEA> \x18 |1
|
||||
<UFFEB> \x1A |1
|
||||
<UFFEC> \x19 |1
|
||||
<UFFED> \xFE |1
|
||||
<UFFEE> \x09 |1
|
||||
END CHARMAP
|
||||
@@ -67,6 +67,20 @@ ${UCM2CP} --region Rare --page 708 --wpage 1256 \
|
||||
--no-browser-save --no-mailnews-display \
|
||||
--no-mailnews-save Rare/ibm-1089.ucm >Rare/CP708.cs
|
||||
|
||||
${UCM2CP} --region Rare --page 737 --wpage 1253 \
|
||||
--name 'Greek (DOS)' \
|
||||
--webname ibm737 --bodyname ibm737 \
|
||||
--headername ibm737 --no-browser-display \
|
||||
--no-browser-save --no-mailnews-display \
|
||||
--no-mailnews-save Rare/ibm-737.ucm >Rare/CP737.cs
|
||||
|
||||
${UCM2CP} --region Rare --page 775 --wpage 1257 \
|
||||
--name 'Baltic (DOS)' \
|
||||
--webname ibm775 --bodyname ibm775 \
|
||||
--headername ibm775 --no-browser-display \
|
||||
--no-browser-save --no-mailnews-display \
|
||||
--no-mailnews-save Rare/ibm-775.ucm >Rare/CP775.cs
|
||||
|
||||
${UCM2CP} --region West --page 850 --wpage 1252 \
|
||||
--name 'Western European (DOS)' \
|
||||
--webname ibm850 --bodyname ibm850 \
|
||||
@@ -481,8 +495,6 @@ exit 0
|
||||
# 709 Arabic - ASMO 449+, BCON V4
|
||||
# 710 Arabic - Transparent Arabic
|
||||
# 720 Arabic - Transparent ASMO
|
||||
# 737 OEM - Greek (formerly 437G)
|
||||
# 775 OEM - Baltic
|
||||
# 936 Chinese Simplified (GB2312)
|
||||
# 949 Korean
|
||||
# 950 Chinese Traditional (Big5)
|
||||
|
||||
@@ -23,12 +23,15 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
Usage: uni2tab
|
||||
|
||||
Required files from ftp.unicode.org: Unihan.txt, CP932.TXT
|
||||
|
||||
*/
|
||||
*
|
||||
* Usage: uni2tab
|
||||
*
|
||||
* Required files from ftp.unicode.org: Unihan.txt, CP932.TXT
|
||||
*
|
||||
* Unihan.txt and CP932.TXT can be found at:
|
||||
* ftp://www.unicode.org/Public/5.0.0/ucd/Unihan.txt
|
||||
* ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@@ -321,6 +324,13 @@ static void convertSJISLine(char *buf)
|
||||
/* Non-CJK characters within JIS */
|
||||
processJis0208(code, (offset / 94) + 1, (offset % 94) + 1);
|
||||
}
|
||||
else if(code >= 0x00A7 && code <= 0x00F7)
|
||||
{
|
||||
/* Non-CJK characters within JIS for which unicodeToJis should not be
|
||||
* edited. In addition to this, do not track lowJis and highJis. */
|
||||
jisx0208ToUnicode[offset] = (unsigned short)(code & 0xFF);
|
||||
jisx0208ToUnicode[offset + 1] = (((unsigned short)(code & 0x00FF)) >> 8);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -8,7 +8,7 @@ LIB_REFS = System.Core System
|
||||
KEYFILE = ../msfinal.pub
|
||||
LIB_MCS_FLAGS =
|
||||
|
||||
XTEST_LIB_REFS = Microsoft.CSharp System.Core Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation
|
||||
XTEST_LIB_REFS = Microsoft.CSharp System.Core System Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation
|
||||
|
||||
|
||||
RESX_RESOURCE_STRING = ../../../external/corefx/src/Microsoft.CSharp/src/Resources/Strings.resx
|
||||
|
||||
@@ -125,7 +125,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\SemanticChecker.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\SubstitutionContext.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\AggregateSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\AssemblyQualifiedNamespaceSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\EventSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\FieldSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\IndexerSymbol.cs" />
|
||||
@@ -161,11 +160,11 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\EXPR.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExpressionIterator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExprOperator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExprWithArgs.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExprWithType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Field.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\FieldInfo.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\HoistedLocal.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\IExprWithArgs.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\IExprWithObject.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\List.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\LocalVariable.cs" />
|
||||
@@ -200,7 +199,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeFactory.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeKind.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeManager.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeParameterType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeParameterType_.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeTable.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\VoidType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\UnaOpSig.cs" />
|
||||
|
||||
@@ -39,130 +39,13 @@ corefx/SR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderException.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderExtensions.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderInternalCompilerException.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/Better.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/ErrorReporting.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingContext.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingFlag.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpArgInfo.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpKind.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpSig.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/CandidateFunctionMember.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ConstVal.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversion.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversions.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/COperators.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/AggregateDeclaration.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExplicitConversion.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionKind.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRExtensions.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExprFactory.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRFLAG.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/FundamentalTypes.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GlobalSymbolContext.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinder.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinderResult.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ImplicitConversion.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookup.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookupResults.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodIterator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodKind.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodTypeInferrer.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Nullable.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/NullableLift.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Operators.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/PredefinedMembers.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SemanticChecker.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SubstitutionContext.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AggregateSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AssemblyQualifiedNamespaceSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/EventSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/FieldSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/IndexerSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/LocalVariableSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodOrPropertySymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceOrAggregateSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/ParentSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/PropertySymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Scope.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolKind.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolLoader.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolManagerBase.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolMask.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolTable.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactory.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/TypeParameterSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/VariableSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayIndex.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayInitialization.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Assignment.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BinaryOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Block.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BoundAnonymousFunction.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Call.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Cast.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Class.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/CompoundOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Concatenate.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Constant.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/EXPR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExpressionIterator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprWithType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Field.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/FieldInfo.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/HoistedLocal.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/IExprWithArgs.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/IExprWithObject.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/List.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/LocalVariable.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MemberGroup.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MethodInfo.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/NamedArgumentSpecification.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Property.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/PropertyInfo.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Return.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Statement.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Temporary.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOf.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UnaryOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UserDefinedConversion.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UserDefinedLogicalOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExpressionTreeRewriter.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExprVisitorBase.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ZeroInitialize.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/TypeBind.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/AggregateType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArgumentListType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArrayType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ErrorType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/MethodGroupType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullableType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ParameterModifierType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PointerType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PredefinedTypes.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/Type.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeArray.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeFactory.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeKind.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeManager.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeParameterType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeTable.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/VoidType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UnaOpSig.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UtilityTypeExtensions.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/WithType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/*.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/*.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/*.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/*.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/*.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/*.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/*.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SpecialNames.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SymbolTable.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/NameManager.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/Names.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/NameTable.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/Operators.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/PredefinedName.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/PredefinedType.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/TokenFacts.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/TokenKind.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/*.cs
|
||||
@@ -1,16 +1,4 @@
|
||||
../../../external/corefx/src/Common/tests/System/Runtime/Serialization/Formatters/BinaryFormatterHelpers.cs
|
||||
../../../external/corefx/src/CoreFx.Private.TestUtilities/src/System/AssertExtensions.cs
|
||||
|
||||
#../../../external/corefx/src/Microsoft.CSharp/tests/*.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/*.cs
|
||||
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/ArrayHandling.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/BindingErrors.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/CSharpArgumentInfoTests.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/EnumArithmeticTests.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/IndexingTests.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/IntegerBinaryOperationTests.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/IntegerUnaryOperationTests.cs
|
||||
#../../../external/corefx/src/Microsoft.CSharp/tests/RuntimeBinderExceptionTests.cs
|
||||
#../../../external/corefx/src/Microsoft.CSharp/tests/RuntimeBinderInternalCompilerExceptionTests.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/RuntimeBinderTests.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/UserDefinedShortCircuitOperators.cs
|
||||
@@ -6,7 +6,7 @@ LIBRARY_SNK = ../mono.snk
|
||||
|
||||
LIB_REFS = System System.Core
|
||||
KEYFILE = $(LIBRARY_SNK)
|
||||
LIB_MCS_FLAGS = /unsafe /publicsign
|
||||
LIB_MCS_FLAGS = /unsafe /publicsign /nowarn:0618
|
||||
|
||||
LIBRARY_WARN_AS_ERROR = yes
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{58A188CE-DED8-48B0-98B7-065A260D21DF}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<NoWarn>1699,618</NoWarn>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
|
||||
@@ -32,7 +32,7 @@
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<NoWarn>1699,618</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
@@ -40,7 +40,7 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<NoWarn>1699,618</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
|
||||
@@ -54,6 +54,8 @@ namespace Mono.Profiler.Log {
|
||||
HeapEnd = 1 << 4,
|
||||
HeapObject = 2 << 4,
|
||||
HeapRoots = 3 << 4,
|
||||
HeapRootRegister = 4 << 4,
|
||||
HeapRootUnregister = 5 << 4,
|
||||
|
||||
SampleHit = 0 << 4,
|
||||
SampleUnmanagedSymbol = 1 << 4,
|
||||
@@ -74,6 +76,7 @@ namespace Mono.Profiler.Log {
|
||||
AppDomain = 4,
|
||||
Thread = 5,
|
||||
Context = 6,
|
||||
VTable = 7,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
@@ -133,6 +136,7 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
// mono/metadata/profiler.h : MonoProfilerGCRootType
|
||||
[Flags]
|
||||
[Obsolete ("The event field using this enum is no longer produced.")]
|
||||
public enum LogHeapRootAttributes {
|
||||
Pinning = 1 << 8,
|
||||
WeakReference = 2 << 8,
|
||||
@@ -147,6 +151,26 @@ namespace Mono.Profiler.Log {
|
||||
TypeMask = 0xff,
|
||||
}
|
||||
|
||||
// mono/metadata/mono-gc.h : MonoGCRootSource
|
||||
public enum LogHeapRootSource {
|
||||
External = 0,
|
||||
Stack = 1,
|
||||
FinalizerQueue = 2,
|
||||
Static = 3,
|
||||
ThreadStatic = 4,
|
||||
ContextStatic = 5,
|
||||
GCHandle = 6,
|
||||
Jit = 7,
|
||||
Threading = 8,
|
||||
AppDomain = 9,
|
||||
Reflection = 10,
|
||||
Marshal = 11,
|
||||
ThreadPool = 12,
|
||||
Debugger = 13,
|
||||
Handle = 14,
|
||||
Ephemeron = 15,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : MonoProfilerMonitorEvent
|
||||
public enum LogMonitorEvent {
|
||||
Contention = 1,
|
||||
|
||||
@@ -66,6 +66,10 @@ namespace Mono.Profiler.Log {
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (VTableLoadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (JitEvent ev)
|
||||
{
|
||||
}
|
||||
@@ -94,6 +98,14 @@ namespace Mono.Profiler.Log {
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (HeapRootRegisterEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (HeapRootUnregisterEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -161,6 +161,20 @@ namespace Mono.Profiler.Log {
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class VTableLoadEvent : LogEvent {
|
||||
|
||||
public long VTablePointer { get; internal set; }
|
||||
|
||||
public long AppDomainId { get; internal set; }
|
||||
|
||||
public long ClassPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class JitEvent : LogEvent {
|
||||
|
||||
public long MethodPointer { get; internal set; }
|
||||
@@ -195,8 +209,11 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
public sealed class AllocationEvent : LogEvent {
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public long ClassPointer { get; internal set; }
|
||||
|
||||
public long VTablePointer { get; internal set; }
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
public long ObjectSize { get; internal set; }
|
||||
@@ -236,8 +253,11 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public long ClassPointer { get; internal set; }
|
||||
|
||||
public long VTablePointer { get; internal set; }
|
||||
|
||||
public long ObjectSize { get; internal set; }
|
||||
|
||||
public IReadOnlyList<HeapObjectReference> References { get; internal set; }
|
||||
@@ -252,13 +272,18 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
public struct HeapRoot {
|
||||
|
||||
public long AddressPointer { get; internal set; }
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public LogHeapRootAttributes Attributes { get; internal set; }
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public long ExtraInfo { get; internal set; }
|
||||
}
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public long MaxGenerationCollectionCount { get; internal set; }
|
||||
|
||||
public IReadOnlyList<HeapRoot> Roots { get; internal set; }
|
||||
@@ -269,6 +294,34 @@ namespace Mono.Profiler.Log {
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class HeapRootRegisterEvent : LogEvent {
|
||||
|
||||
public long RootPointer { get; internal set; }
|
||||
|
||||
public long RootSize { get; internal set; }
|
||||
|
||||
public LogHeapRootSource Source { get; internal set; }
|
||||
|
||||
public long Key { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class HeapRootUnregisterEvent : LogEvent {
|
||||
|
||||
public long RootPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCEvent : LogEvent {
|
||||
|
||||
public LogGCEvent Type { get; internal set; }
|
||||
|
||||
@@ -127,7 +127,8 @@ namespace Mono.Profiler.Log {
|
||||
case LogEventType.AllocationBacktrace:
|
||||
case LogEventType.AllocationNoBacktrace:
|
||||
ev = new AllocationEvent {
|
||||
ClassPointer = ReadPointer (),
|
||||
ClassPointer = StreamHeader.FormatVersion < 15 ? ReadPointer () : 0,
|
||||
VTablePointer = StreamHeader.FormatVersion >= 15 ? ReadPointer () : 0,
|
||||
ObjectPointer = ReadObject (),
|
||||
ObjectSize = (long) _reader.ReadULeb128 (),
|
||||
Backtrace = ReadBacktrace (extType == LogEventType.AllocationBacktrace),
|
||||
@@ -305,6 +306,16 @@ namespace Mono.Profiler.Log {
|
||||
} else
|
||||
throw new LogException ("Invalid context metadata event.");
|
||||
break;
|
||||
case LogMetadataType.VTable:
|
||||
if (load) {
|
||||
ev = new VTableLoadEvent {
|
||||
VTablePointer = ReadPointer (),
|
||||
AppDomainId = ReadPointer (),
|
||||
ClassPointer = ReadPointer (),
|
||||
};
|
||||
} else
|
||||
throw new LogException ("Invalid VTable metadata event.");
|
||||
break;
|
||||
default:
|
||||
throw new LogException ($"Invalid metadata type ({metadataType}).");
|
||||
}
|
||||
@@ -394,7 +405,8 @@ namespace Mono.Profiler.Log {
|
||||
case LogEventType.HeapObject: {
|
||||
HeapObjectEvent hoe = new HeapObjectEvent {
|
||||
ObjectPointer = ReadObject (),
|
||||
ClassPointer = ReadPointer (),
|
||||
ClassPointer = StreamHeader.FormatVersion < 15 ? ReadPointer () : 0,
|
||||
VTablePointer = StreamHeader.FormatVersion >= 15 ? ReadPointer () : 0,
|
||||
ObjectSize = (long) _reader.ReadULeb128 (),
|
||||
};
|
||||
|
||||
@@ -414,17 +426,22 @@ namespace Mono.Profiler.Log {
|
||||
}
|
||||
|
||||
case LogEventType.HeapRoots: {
|
||||
// TODO: This entire event makes no sense.
|
||||
var hre = new HeapRootsEvent ();
|
||||
var list = new HeapRootsEvent.HeapRoot [(int) _reader.ReadULeb128 ()];
|
||||
|
||||
hre.MaxGenerationCollectionCount = (long) _reader.ReadULeb128 ();
|
||||
if (StreamHeader.FormatVersion < 15)
|
||||
hre.MaxGenerationCollectionCount = (long) _reader.ReadULeb128 ();
|
||||
|
||||
for (var i = 0; i < list.Length; i++) {
|
||||
list [i] = new HeapRootsEvent.HeapRoot {
|
||||
AddressPointer = StreamHeader.FormatVersion >= 15 ? ReadPointer () : 0,
|
||||
ObjectPointer = ReadObject (),
|
||||
Attributes = StreamHeader.FormatVersion == 13 ? (LogHeapRootAttributes) _reader.ReadByte () : (LogHeapRootAttributes) _reader.ReadULeb128 (),
|
||||
ExtraInfo = (long) _reader.ReadULeb128 (),
|
||||
Attributes = StreamHeader.FormatVersion < 15 ?
|
||||
(StreamHeader.FormatVersion == 13 ?
|
||||
(LogHeapRootAttributes) _reader.ReadByte () :
|
||||
(LogHeapRootAttributes) _reader.ReadULeb128 ()) :
|
||||
0,
|
||||
ExtraInfo = StreamHeader.FormatVersion < 15 ? (long) _reader.ReadULeb128 () : 0,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -433,6 +450,20 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
break;
|
||||
}
|
||||
case LogEventType.HeapRootRegister:
|
||||
ev = new HeapRootRegisterEvent {
|
||||
RootPointer = ReadPointer (),
|
||||
RootSize = (long) _reader.ReadULeb128 (),
|
||||
Source = (LogHeapRootSource) _reader.ReadByte (),
|
||||
Key = ReadPointer (),
|
||||
Name = _reader.ReadCString (),
|
||||
};
|
||||
break;
|
||||
case LogEventType.HeapRootUnregister:
|
||||
ev = new HeapRootUnregisterEvent {
|
||||
RootPointer = ReadPointer (),
|
||||
};
|
||||
break;
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
@@ -544,6 +575,9 @@ namespace Mono.Profiler.Log {
|
||||
case LogEventType.RuntimeJitHelper: {
|
||||
var helperType = (LogJitHelper) _reader.ReadByte ();
|
||||
|
||||
if (StreamHeader.FormatVersion < 14)
|
||||
helperType--;
|
||||
|
||||
ev = new JitHelperEvent {
|
||||
Type = helperType,
|
||||
BufferPointer = ReadPointer (),
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace Mono.Profiler.Log {
|
||||
public sealed class LogStreamHeader {
|
||||
|
||||
const int MinVersion = 13;
|
||||
const int MaxVersion = 14;
|
||||
const int MaxVersion = 15;
|
||||
|
||||
const int Id = 0x4d505a01;
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ LIB_MCS_FLAGS += -d:NET_3_5
|
||||
endif
|
||||
|
||||
ifdef AOT_FRIENDLY_PROFILE
|
||||
extra_test_flags := -exclude:NotWorkingInterpreter
|
||||
extra_test_flags := -exclude:NotWorkingLinqInterpreter
|
||||
LIB_MCS_FLAGS += -d:NO_FEATURE_STATIC_DELEGATE,FEATURE_MAKE_RUN_METHODS
|
||||
else
|
||||
LIB_MCS_FLAGS += -d:FEATURE_COMPILE,FEATURE_COMPILE_TO_METHODBUILDER,FEATURE_PDB_GENERATOR
|
||||
@@ -52,6 +52,10 @@ BUILT_SOURCES = \
|
||||
endif
|
||||
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
|
||||
XTEST_LIB_REFS = System Facades/System.Threading.Tasks Microsoft.CSharp Facades/System.Text.RegularExpressions Facades/System.Reflection Facades/System.Reflection.Extensions Facades/System.Runtime.InteropServices.RuntimeInformation Facades/System.Reflection.Emit
|
||||
# FEATURE_INTERPRET, FEATURE_COMPILE, NO_FEATURE_STATIC_DELEGATE
|
||||
XTEST_LIB_FLAGS = -unsafe -d:FEATURE_COMPILE
|
||||
XTEST_RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Collections.Immutable/src/Resources/Strings.resx
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
../../build/common/SR.cs
|
||||
|
||||
../../../external/corefx/src/CoreFx.Private.TestUtilities/src/System/AssertExtensions.cs
|
||||
|
||||
# System.Linq.Queryable
|
||||
../../../external/corefx/src/System.Linq.Queryable/tests/*.cs
|
||||
../../../external/corefx/src/Common/tests/System/Linq/SkipTakeData.cs
|
||||
|
||||
# System.Linq.Expressions
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Array/*.cs:NewArrayBoundsTests.cs,ArrayAccessTests.cs,ArrayIndexTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Block/*.cs:NoParameterBlockTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Call/*.cs:CallTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Cast/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Conditional/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Constant/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Convert/*.cs:ConvertCheckedTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/DebuggerTypeProxy/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/DebugInfo/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Default/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/DelegateType/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/DynamicExpression/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/ExceptionHandling/*.cs:ExceptionHandlingExpressions.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Goto/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/ILReader/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/IndexExpression/*.cs:IndexExpressionTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Invoke/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Label/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Lambda/*.cs:LambdaTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Lifted/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/ListInit/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Loop/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Member/*.cs:MemberAccessTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/MemberInit/*.cs:BindTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/New/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/SequenceTests/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Switch/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Ternary/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/TestExtensions/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/TypeBinary/*.cs
|
||||
#../../../external/corefx/src/System.Linq.Expressions/tests/Unary/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Variables/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Visitor/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Assignment/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Bitwise/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Coalesce/*.cs:BinaryCoalesceTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Comparison/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Logical/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/ReferenceComparison/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Unary/IncDecAssign/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/*.cs:CompilerTests.cs,StackSpillerTests.cs,ReadOnlyCollectionBuilderTests.cs
|
||||
Test/System.Linq.Expressions/TestExtensions.cs
|
||||
|
||||
# System.Linq.Expressions
|
||||
../../../external/corefx/src/System.Linq.Parallel/tests/Combinatorial/*.cs
|
||||
../../../external/corefx/src/System.Linq.Parallel/tests/Helpers/*.cs
|
||||
#../../../external/corefx/src/System.Linq.Parallel/tests/QueryOperators/*.cs
|
||||
../../../external/corefx/src/System.Linq.Parallel/tests/*.cs:WithCancellationTests.cs,PlinqModesTests.cs,ExchangeTests.cs,EtwTests.cs
|
||||
../../../external/corefx/src/Common/tests/System/Threading/ThreadPoolHelpers.cs
|
||||
../../../external/corefx/src/Common/tests/System/Diagnostics/Tracing/TestEventListener.cs
|
||||
../../../external/corefx/src/Common/tests/System/ShouldNotBeInvokedException.cs
|
||||
|
||||
# tests need System.Collections.Immutable.dll
|
||||
../../../external/corefx/src/Common/src/System/Runtime/Versioning/NonVersionableAttribute.cs
|
||||
../../../external/corefx/src/System.Collections.Immutable/src/System/Collections/Generic/*.cs
|
||||
../../../external/corefx/src/System.Collections.Immutable/src/System/Collections/Immutable/*.cs
|
||||
../../../external/corefx/src/System.Collections.Immutable/src/Validation/*.cs
|
||||
corefx/SR.tests.cs
|
||||
@@ -403,7 +403,7 @@ namespace MonoTests.System.Linq.Expressions {
|
||||
|
||||
[Test]
|
||||
[Category ("NotDotNet")] // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=319190
|
||||
[Category ("NotWorkingInterpreter")]
|
||||
[Category ("NotWorkingLinqInterpreter")]
|
||||
public void Connect319190 ()
|
||||
{
|
||||
var lambda = Expression.Lambda<Func<bool>> (
|
||||
|
||||
@@ -472,7 +472,7 @@ namespace MonoTests.System.Linq.Expressions
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("NotWorkingInterpreter")]
|
||||
[Category ("NotWorkingLinqInterpreter")]
|
||||
public void NullableNullEqual ()
|
||||
{
|
||||
var param = Expression.Parameter (typeof (DateTime?), "x");
|
||||
|
||||
@@ -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;
|
||||
using System.Threading;
|
||||
using Xunit;
|
||||
|
||||
namespace System.Linq.Expressions.Tests
|
||||
{
|
||||
public static class CompilerTests
|
||||
{
|
||||
public static void VerifyIL(this LambdaExpression expression, string expected, bool appendInnerLambdas = false)
|
||||
{
|
||||
string actual = expression.GetIL(appendInnerLambdas);
|
||||
|
||||
string nExpected = Normalize(expected);
|
||||
string nActual = Normalize(actual);
|
||||
|
||||
Assert.Equal(nExpected, nActual);
|
||||
}
|
||||
|
||||
private static string Normalize(string s)
|
||||
{
|
||||
Collections.Generic.IEnumerable<string> lines =
|
||||
s
|
||||
.Replace("\r\n", "\n")
|
||||
.Split(new[] { '\n' })
|
||||
.Select(line => line.Trim())
|
||||
.Where(line => line != "" && !line.StartsWith("//"));
|
||||
|
||||
return string.Join("\n", lines);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -324,7 +324,7 @@ namespace MonoTests.System.Linq {
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("NotWorkingInterpreter")]
|
||||
[Category ("NotWorkingLinqInterpreter")]
|
||||
public void UserExtensionMethod ()
|
||||
{
|
||||
BindingFlags extensionFlags = BindingFlags.Static | BindingFlags.Public;
|
||||
|
||||
@@ -15,7 +15,6 @@ partial class SR
|
||||
public const string BoundsCannotBeLessThanOne = "Bounds count cannot be less than 1";
|
||||
public const string TypeMustNotBeByRef = "Type must not be ByRef";
|
||||
public const string TypeMustNotBePointer = "Type must not be a pointer type";
|
||||
public const string TypeDoesNotHaveConstructorForTheSignature = "Type doesn't have constructor with a given signature";
|
||||
public const string SetterMustBeVoid = "Setter should have void type.";
|
||||
public const string PropertyTypeMustMatchGetter = "Property type must match the value type of getter";
|
||||
public const string PropertyTypeMustMatchSetter = "Property type must match the value type of setter";
|
||||
@@ -88,7 +87,6 @@ partial class SR
|
||||
public const string PropertyDoesNotHaveAccessor = "The property '{0}' has no 'get' or 'set' accessors";
|
||||
public const string NotAMemberOfType = "'{0}' is not a member of type '{1}'";
|
||||
public const string NotAMemberOfAnyType = "'{0}' is not a member of any type";
|
||||
public const string ExpressionNotSupportedForType = "The expression '{0}' is not supported for type '{1}'";
|
||||
public const string UnsupportedExpressionType = "The expression type '{0}' is not supported";
|
||||
public const string ParameterExpressionNotValidAsDelegate = "ParameterExpression of type '{0}' cannot be used for delegate parameter of type '{1}'";
|
||||
public const string PropertyNotDefinedForType = "Property '{0}' is not defined for type '{1}'";
|
||||
@@ -104,12 +102,9 @@ partial class SR
|
||||
public const string ElementInitializerMethodWithZeroArgs = "Element initializer method must have at least 1 parameter";
|
||||
public const string ElementInitializerMethodStatic = "Element initializer method must be an instance method";
|
||||
public const string TypeNotIEnumerable = "Type '{0}' is not IEnumerable";
|
||||
public const string UnexpectedCoalesceOperator = "Unexpected coalesce operator.";
|
||||
public const string InvalidCast = "Cannot cast from type '{0}' to type '{1}";
|
||||
public const string UnhandledBinary = "Unhandled binary: {0}";
|
||||
public const string UnhandledBinding = "Unhandled binding ";
|
||||
public const string UnhandledBindingType = "Unhandled Binding Type: {0}";
|
||||
public const string UnhandledConvert = "Unhandled convert: {0}";
|
||||
public const string UnhandledUnary = "Unhandled unary: {0}";
|
||||
public const string UnknownBindingType = "Unknown binding type";
|
||||
public const string UserDefinedOpMustHaveConsistentTypes = "The user-defined operator method '{1}' for operator '{0}' must have identical parameter and return types.";
|
||||
@@ -131,11 +126,9 @@ partial class SR
|
||||
public const string ControlCannotEnterTry = "Control cannot enter a try block.";
|
||||
public const string ControlCannotEnterExpression = "Control cannot enter an expression--only statements can be jumped into.";
|
||||
public const string NonLocalJumpWithValue = "Cannot jump to non-local label '{0}' with a value. Only jumps to labels defined in outer blocks can pass values.";
|
||||
public const string ExtensionNotReduced = "Extension should have been reduced.";
|
||||
public const string CannotCompileConstant = "CompileToMethod cannot compile constant '{0}' because it is a non-trivial value, such as a live object. Instead, create an expression tree that can construct this value.";
|
||||
public const string CannotCompileDynamic = "Dynamic expressions are not supported by CompileToMethod. Instead, create an expression tree that uses System.Runtime.CompilerServices.CallSite.";
|
||||
public const string InvalidLvalue = "Invalid lvalue for assignment: {0}.";
|
||||
public const string UnknownLiftType = "unknown lift type: '{0}'.";
|
||||
public const string UndefinedVariable = "variable '{0}' of type '{1}' referenced from scope '{2}', but it is not defined";
|
||||
public const string CannotCloseOverByRef = "Cannot close over byref parameter '{0}' referenced in lambda '{1}'";
|
||||
public const string UnexpectedVarArgsCall = "Unexpected VarArgs call to method '{0}'";
|
||||
@@ -162,7 +155,6 @@ partial class SR
|
||||
public const string IncorrectNumberOfMethodCallArguments = "Incorrect number of arguments supplied for call to method '{0}'";
|
||||
public const string IncorrectNumberOfLambdaArguments = "Incorrect number of arguments supplied for lambda invocation";
|
||||
public const string IncorrectNumberOfConstructorArguments = "Incorrect number of arguments for constructor";
|
||||
public const string OperatorNotImplementedForType = "The operator '{0}' is not implemented for type '{1}'";
|
||||
public const string NonStaticConstructorRequired = "The constructor should not be static";
|
||||
public const string NonAbstractConstructorRequired = "Can't compile a NewExpression with a constructor declared on an abstract class";
|
||||
public const string FirstArgumentMustBeCallSite = "First argument of delegate must be CallSite";
|
||||
@@ -181,6 +173,7 @@ partial class SR
|
||||
public const string CollectionReadOnly = "Collection is read-only.";
|
||||
public const string KeyDoesNotExistInExpando = "The specified key '{0}' does not exist in the ExpandoObject.";
|
||||
public const string SameKeyExistsInExpando = "An element with the same key '{0}' already exists in the ExpandoObject.";
|
||||
public const string Arg_KeyNotFoundWithKey = "The given key '{0}' was not present in the dictionary.";
|
||||
public const string EmptyEnumerable = "Enumeration yielded no results";
|
||||
public const string MoreThanOneElement = "Sequence contains more than one element";
|
||||
public const string MoreThanOneMatch = "Sequence contains more than one matching element";
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
//
|
||||
// This file was generated by resx2sr tool
|
||||
//
|
||||
|
||||
partial class SR
|
||||
{
|
||||
public const string Arg_KeyNotFoundWithKey = "The given key '{0}' was not present in the dictionary.";
|
||||
public const string ArrayInitializedStateNotEqual = "Object is not an array with the same initialization state as the array to compare it to.";
|
||||
public const string ArrayLengthsNotEqual = "Object is not an array with the same number of elements as the array to compare it to.";
|
||||
public const string CannotFindOldValue = "Cannot find the old value";
|
||||
public const string CapacityMustBeGreaterThanOrEqualToCount = "Capacity was less than the current Count of elements.";
|
||||
public const string CapacityMustEqualCountOnMove = "MoveToImmutable can only be performed when Count equals Capacity.";
|
||||
public const string CollectionModifiedDuringEnumeration = "Collection was modified; enumeration operation may not execute.";
|
||||
public const string DuplicateKey = "An element with the same key but a different value already exists. Key: {0}";
|
||||
public const string InvalidEmptyOperation = "This operation does not apply to an empty instance.";
|
||||
public const string InvalidOperationOnDefaultArray = "This operation cannot be performed on a default instance of ImmutableArray<T>. Consider initializing the array, or checking the ImmutableArray<T>.IsDefault property.";
|
||||
}
|
||||
@@ -54,6 +54,8 @@
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Interop.Odbc.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Linux\Interop.Libraries.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
|
||||
@@ -327,13 +329,10 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlDataImplementation.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XPathNodePointer.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\DBConnectionString.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\ExternDll.Linux.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\NameValuePermission.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\SafeNativeMethods.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\UnsafeNativeMethods.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\ProviderBase\DbBuffer.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\HResults.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Properties\SecurityTransparent.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\DbDataRecord.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\Odbc32.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommand.cs" />
|
||||
@@ -409,7 +408,9 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbReferenceCollection.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\TimeoutTimer.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlMetaData.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlNorm.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlNotificationRequest.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlSer.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\ApplicationIntent.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
|
||||
@@ -489,6 +490,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlStatistics.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlStream.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlUdtInfo.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlUtil.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsEnums.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParameterSetter.cs" />
|
||||
@@ -553,8 +555,6 @@
|
||||
<Compile Include="corefx\SqlConnectionStringBuilder.cs" />
|
||||
<Compile Include="corefx\SqlDependencyUtils.cs" />
|
||||
<Compile Include="corefx\SqlException.cs" />
|
||||
<Compile Include="corefx\SqlMetaData.cs" />
|
||||
<Compile Include="corefx\SqlParameter.cs" />
|
||||
<Compile Include="corefx\SqlParameterCollection.cs" />
|
||||
<Compile Include="corefx\SR.cs" />
|
||||
<Compile Include="corefx\TdsEnums.cs" />
|
||||
|
||||
@@ -19,8 +19,6 @@ corefx/DiagnosticListener.cs
|
||||
corefx/SqlClientFactory.cs
|
||||
corefx/SqlCommand.cs
|
||||
corefx/SqlException.cs
|
||||
corefx/SqlMetaData.cs
|
||||
corefx/SqlParameter.cs
|
||||
corefx/SqlConnection.cs
|
||||
corefx/SqlConnectionStringBuilder.cs
|
||||
corefx/SqlParameterCollection.cs
|
||||
@@ -361,8 +359,10 @@ corefx/SqlDependencyUtils.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
|
||||
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Sql/SqlSer.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDelegatedTransaction.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlClientMetaDataCollectionNames.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/ApplicationIntent.cs
|
||||
@@ -456,6 +456,7 @@ corefx/SqlDependencyUtils.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SspiClientContextStatus.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SSRP.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObjectManaged.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlUdtInfo.cs
|
||||
|
||||
../../../external/corefx/src/Common/src/System/Net/ContextFlagsPal.cs
|
||||
../../../external/corefx/src/Common/src/System/Net/SecurityStatusPal.cs
|
||||
|
||||
@@ -82,11 +82,6 @@ namespace System.Data.Common
|
||||
return InvalidOperation(SR.GetString(SR.ADP_OffsetOutOfRangeException));
|
||||
}
|
||||
|
||||
internal static ArgumentException InvalidDataType(TypeCode typecode)
|
||||
{
|
||||
return Argument(SR.GetString(SR.ADP_InvalidDataType, typecode.ToString()));
|
||||
}
|
||||
|
||||
static internal InvalidOperationException QuotePrefixNotSet(string method)
|
||||
{
|
||||
return InvalidOperation(Res.GetString(Res.ADP_QuotePrefixNotSet, method));
|
||||
@@ -104,11 +99,6 @@ namespace System.Data.Common
|
||||
return ADP.InvalidOperation(SR.GetString(SR.ADP_InvalidDataDirectory));
|
||||
}
|
||||
|
||||
internal static ArgumentException UnknownDataTypeCode(Type dataType, TypeCode typeCode)
|
||||
{
|
||||
return Argument(SR.GetString(SR.ADP_UnknownDataTypeCode, ((int)typeCode).ToString(CultureInfo.InvariantCulture), dataType.FullName));
|
||||
}
|
||||
|
||||
internal static void EscapeSpecialCharacters(string unescapedString, StringBuilder escapedString)
|
||||
{
|
||||
// note special characters list is from character escapes
|
||||
@@ -137,29 +127,6 @@ namespace System.Data.Common
|
||||
return (IntPtr)checked(pbase.ToInt64() + offset);
|
||||
}
|
||||
|
||||
static internal ArgumentOutOfRangeException NotSupportedUserDefinedTypeSerializationFormat(Microsoft.SqlServer.Server.Format value, string method) {
|
||||
return ADP.NotSupportedEnumerationValue(typeof(Microsoft.SqlServer.Server.Format), value.ToString(), method);
|
||||
}
|
||||
|
||||
static internal ArgumentOutOfRangeException InvalidUserDefinedTypeSerializationFormat(Microsoft.SqlServer.Server.Format value) {
|
||||
#if DEBUG
|
||||
switch(value) {
|
||||
case Microsoft.SqlServer.Server.Format.Unknown:
|
||||
case Microsoft.SqlServer.Server.Format.Native:
|
||||
case Microsoft.SqlServer.Server.Format.UserDefined:
|
||||
Debug.Assert(false, "valid UserDefinedTypeSerializationFormat " + value.ToString());
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
return InvalidEnumerationValue(typeof(Microsoft.SqlServer.Server.Format), (int) value);
|
||||
}
|
||||
|
||||
static internal ArgumentOutOfRangeException ArgumentOutOfRange(string message, string parameterName, object value) {
|
||||
ArgumentOutOfRangeException e = new ArgumentOutOfRangeException(parameterName, value, message);
|
||||
TraceExceptionAsReturnValue(e);
|
||||
return e;
|
||||
}
|
||||
|
||||
static internal Exception InvalidXMLBadVersion() {
|
||||
return Argument(Res.GetString(Res.ADP_InvalidXMLBadVersion));
|
||||
}
|
||||
|
||||
@@ -475,7 +475,7 @@ partial class SR
|
||||
public const string Arg_RankMultiDimNotSupported = "Only single dimensional arrays are supported for the requested action.";
|
||||
public const string Arg_RemoveArgNotFound = "Cannot remove the specified item because it was not found in the specified Collection.";
|
||||
public const string ArgumentOutOfRange_NeedNonNegNum = "Non-negative number required.";
|
||||
public const string ADP_DeriveParametersNotSupported = "{0} DeriveParameters only supports CommandType.StoredProcedure, not CommandType.{1}.";
|
||||
public const string ADP_DeriveParametersNotSupported = "{0} DeriveParameters only supports CommandType.StoredProcedure, not CommandType. {1}.";
|
||||
public const string ADP_NoStoredProcedureExists = "The stored procedure '{0}' doesn't exist.";
|
||||
public const string ADP_MissingConnectionOptionValue = "Use of key '{0}' requires the key '{1}' to be present.";
|
||||
public const string ADP_InvalidConnectionOptionValueLength = "The value's length for key '{0}' exceeds it's limit of '{1}'.";
|
||||
@@ -505,6 +505,7 @@ partial class SR
|
||||
public const string ADP_NonSequentialColumnAccess = "Invalid attempt to read from column ordinal '{0}'. With CommandBehavior.SequentialAccess, you may only read from column ordinal '{1}' or greater.";
|
||||
public const string ADP_InvalidDataType = "The parameter data type of {0} is invalid.";
|
||||
public const string ADP_UnknownDataType = "No mapping exists from object type {0} to a known managed provider native type.";
|
||||
public const string ADP_UnknownDataTypeCode = "Unable to handle an unknown TypeCode {0} returned by Type {1}.";
|
||||
public const string ADP_DbTypeNotSupported = "No mapping exists from DbType {0} to a known {1}.";
|
||||
public const string ADP_VersionDoesNotSupportDataType = "The version of SQL Server in use does not support datatype '{0}'.";
|
||||
public const string ADP_ParameterValueOutOfRange = "Parameter value '{0}' is out of range.";
|
||||
@@ -524,6 +525,7 @@ partial class SR
|
||||
public const string SQL_EncryptionNotSupportedByClient = "The instance of SQL Server you attempted to connect to requires encryption but this machine does not support it.";
|
||||
public const string SQL_EncryptionNotSupportedByServer = "The instance of SQL Server you attempted to connect to does not support encryption.";
|
||||
public const string SQL_InvalidSQLServerVersionUnknown = "Unsupported SQL Server version. The .Net Framework SqlClient Data Provider can only be used with SQL Server versions 7.0 and later.";
|
||||
public const string SQL_CannotCreateNormalizer = "Cannot create normalizer for '{0}'.";
|
||||
public const string SQL_CannotModifyPropertyAsyncOperationInProgress = "{0} cannot be changed while async operation is in progress.";
|
||||
public const string SQL_InstanceFailure = "Instance failure.";
|
||||
public const string SQL_InvalidPartnerConfiguration = "Server {0}, database {1} is not configured for database mirroring.";
|
||||
@@ -609,6 +611,8 @@ partial class SR
|
||||
public const string SqlMisc_StreamErrorMessage = "An error occurred while reading.";
|
||||
public const string SqlMisc_TruncationMaxDataMessage = "Data returned is larger than 2Gb in size. Use SequentialAccess command behavior in order to get all of the data.";
|
||||
public const string SqlMisc_SubclassMustOverride = "Subclass did not override a required method.";
|
||||
public const string SqlUdtReason_NoUdtAttribute = "no UDT attribute";
|
||||
public const string SQLUDT_InvalidSqlType = "Specified type is not registered on the target server. {0}.";
|
||||
public const string Sql_InternalError = "Internal Error";
|
||||
public const string ADP_OperationAborted = "Operation aborted.";
|
||||
public const string ADP_OperationAbortedExceptionMessage = "Operation aborted due to an exception (see InnerException for details).";
|
||||
@@ -639,6 +643,13 @@ partial class SR
|
||||
public const string SqlProvider_DuplicateSortOrdinal = "The sort ordinal {0} was specified twice.";
|
||||
public const string SqlProvider_MissingSortOrdinal = "The sort ordinal {0} was not specified.";
|
||||
public const string SqlProvider_SortOrdinalGreaterThanFieldCount = "The sort ordinal {0} on field {1} exceeds the total number of fields.";
|
||||
public const string SQLUDT_MaxByteSizeValue = "range: 0-8000";
|
||||
public const string SQLUDT_Unexpected = "unexpected error encountered in SqlClient data provider. {0}";
|
||||
public const string SQLUDT_UnexpectedUdtTypeName = "UdtTypeName property must be set only for UDT parameters.";
|
||||
public const string SQLUDT_InvalidUdtTypeName = "UdtTypeName property must be set for UDT parameters.";
|
||||
public const string SqlUdt_InvalidUdtMessage = "'{0}' is an invalid user defined type, reason: {1}.";
|
||||
public const string SQL_UDTTypeName = "SqlParameter.UdtTypeName is an invalid multipart name";
|
||||
public const string SQL_InvalidUdt3PartNameFormat = "Invalid 3 part name format for UdtTypeName.";
|
||||
public const string IEnumerableOfSqlDataRecordHasNoRows = "There are no records in the SqlDataRecord enumeration. To send a table-valued parameter with no rows, use a null reference for the value instead.";
|
||||
public const string SNI_ERROR_1 = "I/O Error detected in read/write operation";
|
||||
public const string SNI_ERROR_2 = "Connection was terminated";
|
||||
@@ -787,7 +798,6 @@ partial class SR
|
||||
public const string ADP_DatabaseNameTooLong = "The argument is too long.";
|
||||
public const string ADP_DataReaderNoData = "No data exists for the row/column.";
|
||||
public const string ADP_NumericToDecimalOverflow = "The numerical value is too large to fit into a 96 bit decimal.";
|
||||
public const string ADP_UnknownDataTypeCode = "Unable to handle an unknown TypeCode {0} returned by Type {1}.";
|
||||
public const string ADP_DbRecordReadOnly = "'{0}' cannot be called when the record is read only.";
|
||||
public const string ADP_OffsetOutOfRangeException = "Offset must refer to a location within the value.";
|
||||
public const string ODBC_GetSchemaRestrictionRequired = "The ODBC managed provider requires that the TABLE_NAME restriction be specified and non-null for the GetSchema indexes collection.";
|
||||
|
||||
@@ -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.Data;
|
||||
|
||||
namespace Microsoft.SqlServer.Server
|
||||
{
|
||||
partial class SqlMetaData
|
||||
{
|
||||
public SqlMetaData (string name, SqlDbType dbType, Type userDefinedType) :
|
||||
this (name, dbType, -1, 0, 0, 0, System.Data.SqlTypes.SqlCompareOptions.None, userDefinedType) { }
|
||||
|
||||
|
||||
[MonoTODO]
|
||||
public System.Data.DbType DbType {
|
||||
get => throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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.Collections;
|
||||
using System.Data;
|
||||
using System.Data.Common;
|
||||
|
||||
namespace System.Data.SqlClient
|
||||
{
|
||||
partial class SqlParameter
|
||||
{
|
||||
[MonoTODO]
|
||||
public string UdtTypeName
|
||||
{
|
||||
get => throw new NotImplementedException();
|
||||
set => throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
#include corefx.unix.sources
|
||||
#include net_4_x_System.Data.dll.sources
|
||||
|
||||
../../../external/corefx/src/System.Data.Odbc/src/Common/System/Data/Common/ExternDll.Osx.cs
|
||||
../../../external/corefx/src/Common/src/Interop/OSX/Interop.Libraries.cs
|
||||
@@ -1,4 +1,4 @@
|
||||
#include corefx.unix.sources
|
||||
#include net_4_x_System.Data.dll.sources
|
||||
|
||||
../../../external/corefx/src/System.Data.Odbc/src/Common/System/Data/Common/ExternDll.Linux.cs
|
||||
../../../external/corefx/src/Common/src/Interop/Linux/Interop.Libraries.cs
|
||||
@@ -24,7 +24,8 @@ System.Data.SqlClient/SQLDebugging.cs
|
||||
corefx/Odbc/OdbcFactory.cs
|
||||
corefx/Odbc/DbConnectionStringCommon.cs
|
||||
../referencesource/System.Data/System/Data/Odbc/OdbcPermission.cs
|
||||
../../../external/corefx/src/System.Data.Odbc/src/Properties/SecurityTransparent.cs
|
||||
|
||||
../../../external/corefx/src/Common/src/Interop/Interop.Odbc.cs
|
||||
../../../external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/DbDataRecord.cs
|
||||
../../../external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/Odbc32.cs
|
||||
../../../external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcCommand.cs
|
||||
@@ -61,7 +62,6 @@ corefx/Odbc/DbConnectionStringCommon.cs
|
||||
../../../external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcType.cs
|
||||
../../../external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcUtils.cs
|
||||
../../../external/corefx/src/System.Data.Odbc/src/Common/System/HResults.cs
|
||||
../../../external/corefx/src/System.Data.Odbc/src/Common/System/Data/Common/UnsafeNativeMethods.cs
|
||||
|
||||
# OLEDB
|
||||
corefx/OleDbStubs.cs
|
||||
|
||||
@@ -46,5 +46,7 @@
|
||||
../../../external/corefx/src/Common/src/System/Net/SecurityStatusAdapterPal.Windows.cs
|
||||
../../../external/corefx/src/Common/src/System/Collections/Generic/BidirectionalDictionary.cs
|
||||
|
||||
../../../external/corefx/src/Common/src/Interop/Windows/SChannel/Interop.SecPkgContext_ApplicationProtocol.cs
|
||||
|
||||
# ODBC:
|
||||
../../../external/corefx/src/System.Data.Odbc/src/Common/System/Data/Common/ExternDll.Windows.cs
|
||||
../../../external/corefx/src/Common/src/Interop/Windows/Interop.Libraries.cs
|
||||
@@ -387,7 +387,7 @@ namespace System.Net.Http
|
||||
}
|
||||
}
|
||||
|
||||
wrequest.ResendContentFactory = content.CopyTo;
|
||||
wrequest.ResendContentFactory = content.CopyToAsync;
|
||||
|
||||
using (var stream = await wrequest.GetRequestStreamAsync ().ConfigureAwait (false)) {
|
||||
await request.Content.CopyToAsync (stream).ConfigureAwait (false);
|
||||
|
||||
@@ -13,7 +13,8 @@ LIBRARY_WARN_AS_ERROR = yes
|
||||
|
||||
RESX_RESOURCE_STRING = \
|
||||
../../../external/corefx/src/System.Runtime.Numerics/src/Resources/Strings.resx \
|
||||
../../../external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx
|
||||
../../../external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx \
|
||||
../../../external/corefx/src/System.Buffers/src/Resources/Strings.resx
|
||||
|
||||
EXTRA_DISTFILES =
|
||||
|
||||
|
||||
@@ -57,6 +57,12 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\System\Globalization\FormatProvider.Number.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\System\MathF.netstandard.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\System\Numerics\Hashing\HashHelpers.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\System\Text\ValueStringBuilder.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Buffers\src\System\Buffers\ArrayPool.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Buffers\src\System\Buffers\ArrayPoolEventSource.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Buffers\src\System\Buffers\DefaultArrayPool.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Buffers\src\System\Buffers\DefaultArrayPoolBucket.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Buffers\src\System\Buffers\Utilities.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Numerics.Vectors\src\System\Numerics\JitIntrinsicAttribute.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Numerics.Vectors\src\System\Numerics\Matrix3x2.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Numerics.Vectors\src\System\Numerics\Matrix4x4.cs" />
|
||||
|
||||
@@ -6,6 +6,14 @@ corefx/Vector.cs
|
||||
|
||||
../../../external/corefx/src/Common/src/System/Globalization/FormatProvider.Number.cs
|
||||
../../../external/corefx/src/Common/src/System/Numerics/Hashing/HashHelpers.cs
|
||||
../../../external/corefx/src/Common/src/System/Text/ValueStringBuilder.cs
|
||||
|
||||
# ValueStringBuilder.cs dependency
|
||||
../../../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
|
||||
|
||||
../../../external/corefx/src/System.Runtime.Numerics/src/System/Globalization/FormatProvider.BigInteger.cs
|
||||
../../../external/corefx/src/System.Runtime.Numerics/src/System/Globalization/FormatProvider.NumberBuffer.cs
|
||||
|
||||
@@ -22,4 +22,5 @@ partial class SR
|
||||
public const string Arg_ElementsInSourceIsGreaterThanDestination = "Number of elements in source vector is greater than the destination array";
|
||||
public const string Arg_NullArgumentNullRef = "The method was called with a null array argument.";
|
||||
public const string Arg_TypeNotSupported = "Specified type is not supported";
|
||||
public const string ArgumentException_BufferNotFromPool = "The buffer is not associated with this pool and may not be returned to it.";
|
||||
}
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- WARNING: this file is autogenerated, don't modify it. Edit the .sources file of the corresponding assembly instead if you want to add/remove C# source files. -->
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{6C50BF24-90AB-4654-B295-16A1C717643C}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
|
||||
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
|
||||
<IntermediateOutputPath>obj-net_4_x-$(HostPlatform)</IntermediateOutputPath>
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Runtime.CompilerServices.Unsafe</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
</ItemGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -8,6 +8,7 @@ MONO_SECURITY=Mono.Security
|
||||
endif
|
||||
|
||||
LIBRARY = System.Security.dll
|
||||
API_BIN_REFS := System.Numerics
|
||||
LIB_REFS = secxml/System bare/System.Xml $(MONO_SECURITY)
|
||||
KEYFILE = ../msfinal.pub
|
||||
LIB_MCS_FLAGS = \
|
||||
@@ -28,10 +29,6 @@ EXTRA_DISTFILES = \
|
||||
|
||||
RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Security.Cryptography.Xml/src/Resources/Strings.resx
|
||||
|
||||
ifdef MOBILE_PROFILE
|
||||
NO_TEST = yes
|
||||
endif
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
$(build_lib): $(secxml_libdir)/System.dll $(MONO_SECURITY_DLL)
|
||||
|
||||
@@ -98,6 +98,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoName.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoNode.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoRetrievalMethod.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoX509Data.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyReference.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\MyXmlDocument.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceFrame.cs" />
|
||||
@@ -111,11 +112,14 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA384SignatureDescription.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA512SignatureDescription.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SignatureDescription.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Signature.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedInfo.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedXmlDebugLog.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SymmetricKeyWrap.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Transform.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\TransformChain.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Utils.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\X509IssuerSerial.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDecryptionTransform.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigBase64Transform.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigC14NTransform.cs" />
|
||||
@@ -165,13 +169,7 @@
|
||||
<Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierType.cs" />
|
||||
<Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2UI.cs" />
|
||||
<Compile Include="System.Security.Cryptography.X509Certificates\X509SelectionFlag.cs" />
|
||||
<Compile Include="System.Security.Cryptography.Xml\KeyInfoX509Data.cs" />
|
||||
<Compile Include="System.Security.Cryptography.Xml\Manifest.cs" />
|
||||
<Compile Include="System.Security.Cryptography.Xml\Signature.cs" />
|
||||
<Compile Include="System.Security.Cryptography.Xml\SignedInfo.cs" />
|
||||
<Compile Include="System.Security.Cryptography.Xml\SignedXml.cs" />
|
||||
<Compile Include="System.Security.Cryptography.Xml\X509IssuerSerial.cs" />
|
||||
<Compile Include="System.Security.Cryptography.Xml\XmlSignature.cs" />
|
||||
<Compile Include="System.Security.Cryptography\CryptographicAttribute.cs" />
|
||||
<Compile Include="System.Security.Cryptography\CryptographicAttributeCollection.cs" />
|
||||
<Compile Include="System.Security.Cryptography\CryptographicAttributeEnumerator.cs" />
|
||||
@@ -209,6 +207,11 @@
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<Reference Include="./../../../external/binary-reference-assemblies/v4.7.1/System.Numerics.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../external/binary-reference-assemblies/v4.7.1/System.Numerics.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../System/System-secxml-net_4_x.csproj">
|
||||
<Project>{19954F80-065E-4D46-8FEF-62BA4D6CFDAD}</Project>
|
||||
<Name>System-secxml-net_4_x</Name>
|
||||
|
||||
@@ -1,285 +0,0 @@
|
||||
//
|
||||
// KeyInfoX509Data.cs - KeyInfoX509Data implementation for XML Signature
|
||||
//
|
||||
// Authors:
|
||||
// Sebastien Pouliot <[email protected]>
|
||||
// Atsushi Enomoto ([email protected])
|
||||
// Tim Coleman ([email protected])
|
||||
//
|
||||
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
|
||||
// Copyright (C) Tim Coleman, 2004
|
||||
// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System.Collections;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Xml;
|
||||
|
||||
namespace System.Security.Cryptography.Xml {
|
||||
|
||||
public class KeyInfoX509Data : KeyInfoClause {
|
||||
|
||||
private byte[] x509crl;
|
||||
private ArrayList IssuerSerialList;
|
||||
private ArrayList SubjectKeyIdList;
|
||||
private ArrayList SubjectNameList;
|
||||
private ArrayList X509CertificateList;
|
||||
|
||||
public KeyInfoX509Data ()
|
||||
{
|
||||
}
|
||||
|
||||
public KeyInfoX509Data (byte[] rgbCert)
|
||||
{
|
||||
AddCertificate (new X509Certificate (rgbCert));
|
||||
}
|
||||
|
||||
public KeyInfoX509Data (X509Certificate cert)
|
||||
{
|
||||
AddCertificate (cert);
|
||||
}
|
||||
|
||||
#if SECURITY_DEP
|
||||
public KeyInfoX509Data (X509Certificate cert, X509IncludeOption includeOption)
|
||||
{
|
||||
if (cert == null)
|
||||
throw new ArgumentNullException ("cert");
|
||||
|
||||
switch (includeOption) {
|
||||
case X509IncludeOption.None:
|
||||
case X509IncludeOption.EndCertOnly:
|
||||
AddCertificate (cert);
|
||||
break;
|
||||
case X509IncludeOption.ExcludeRoot:
|
||||
AddCertificatesChainFrom (cert, false);
|
||||
break;
|
||||
case X509IncludeOption.WholeChain:
|
||||
AddCertificatesChainFrom (cert, true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// this gets complicated because we must:
|
||||
// 1. build the chain using a X509Certificate2 class;
|
||||
// 2. test for root using the Mono.Security.X509.X509Certificate class;
|
||||
// 3. add the certificates as X509Certificate instances;
|
||||
private void AddCertificatesChainFrom (X509Certificate cert, bool root)
|
||||
{
|
||||
X509Chain chain = new X509Chain ();
|
||||
chain.Build (new X509Certificate2 (cert));
|
||||
foreach (X509ChainElement ce in chain.ChainElements) {
|
||||
byte[] rawdata = ce.Certificate.RawData;
|
||||
if (!root) {
|
||||
// exclude root
|
||||
Mono.Security.X509.X509Certificate mx = new Mono.Security.X509.X509Certificate (rawdata);
|
||||
if (mx.IsSelfSigned)
|
||||
rawdata = null;
|
||||
}
|
||||
|
||||
if (rawdata != null)
|
||||
AddCertificate (new X509Certificate (rawdata));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
public ArrayList Certificates {
|
||||
get { return X509CertificateList; }
|
||||
}
|
||||
|
||||
public byte[] CRL {
|
||||
get { return x509crl; }
|
||||
set { x509crl = value; }
|
||||
}
|
||||
|
||||
public ArrayList IssuerSerials {
|
||||
get { return IssuerSerialList; }
|
||||
}
|
||||
|
||||
public ArrayList SubjectKeyIds {
|
||||
get { return SubjectKeyIdList; }
|
||||
}
|
||||
|
||||
public ArrayList SubjectNames {
|
||||
get { return SubjectNameList; }
|
||||
}
|
||||
|
||||
public void AddCertificate (X509Certificate certificate)
|
||||
{
|
||||
if (certificate == null)
|
||||
throw new ArgumentNullException ("certificate");
|
||||
if (X509CertificateList == null)
|
||||
X509CertificateList = new ArrayList ();
|
||||
X509CertificateList.Add (certificate);
|
||||
}
|
||||
|
||||
public void AddIssuerSerial (string issuerName, string serialNumber)
|
||||
{
|
||||
if (issuerName == null)
|
||||
throw new ArgumentException ("issuerName");
|
||||
if (IssuerSerialList == null)
|
||||
IssuerSerialList = new ArrayList ();
|
||||
|
||||
X509IssuerSerial xis = new X509IssuerSerial (issuerName, serialNumber);
|
||||
IssuerSerialList.Add (xis);
|
||||
}
|
||||
|
||||
public void AddSubjectKeyId (byte[] subjectKeyId)
|
||||
{
|
||||
if (SubjectKeyIdList == null)
|
||||
SubjectKeyIdList = new ArrayList ();
|
||||
|
||||
SubjectKeyIdList.Add (subjectKeyId);
|
||||
}
|
||||
|
||||
[ComVisible (false)]
|
||||
public void AddSubjectKeyId (string subjectKeyId)
|
||||
{
|
||||
if (SubjectKeyIdList == null)
|
||||
SubjectKeyIdList = new ArrayList ();
|
||||
|
||||
byte[] id = null;
|
||||
if (subjectKeyId != null)
|
||||
id = Convert.FromBase64String (subjectKeyId);
|
||||
SubjectKeyIdList.Add (id);
|
||||
}
|
||||
|
||||
public void AddSubjectName (string subjectName)
|
||||
{
|
||||
if (SubjectNameList == null)
|
||||
SubjectNameList = new ArrayList ();
|
||||
|
||||
SubjectNameList.Add (subjectName);
|
||||
}
|
||||
|
||||
public override XmlElement GetXml ()
|
||||
{
|
||||
XmlDocument document = new XmlDocument ();
|
||||
XmlElement xel = document.CreateElement (XmlSignature.ElementNames.X509Data, XmlSignature.NamespaceURI);
|
||||
// FIXME: hack to match MS implementation
|
||||
xel.SetAttribute ("xmlns", XmlSignature.NamespaceURI);
|
||||
// <X509IssuerSerial>
|
||||
if ((IssuerSerialList != null) && (IssuerSerialList.Count > 0)) {
|
||||
foreach (X509IssuerSerial iser in IssuerSerialList) {
|
||||
XmlElement isl = document.CreateElement (XmlSignature.ElementNames.X509IssuerSerial, XmlSignature.NamespaceURI);
|
||||
XmlElement xin = document.CreateElement (XmlSignature.ElementNames.X509IssuerName, XmlSignature.NamespaceURI);
|
||||
xin.InnerText = iser.IssuerName;
|
||||
isl.AppendChild (xin);
|
||||
XmlElement xsn = document.CreateElement (XmlSignature.ElementNames.X509SerialNumber, XmlSignature.NamespaceURI);
|
||||
xsn.InnerText = iser.SerialNumber;
|
||||
isl.AppendChild (xsn);
|
||||
xel.AppendChild (isl);
|
||||
}
|
||||
}
|
||||
// <X509SKI>
|
||||
if ((SubjectKeyIdList != null) && (SubjectKeyIdList.Count > 0)) {
|
||||
foreach (byte[] skid in SubjectKeyIdList) {
|
||||
XmlElement ski = document.CreateElement (XmlSignature.ElementNames.X509SKI, XmlSignature.NamespaceURI);
|
||||
ski.InnerText = Convert.ToBase64String (skid);
|
||||
xel.AppendChild (ski);
|
||||
}
|
||||
}
|
||||
// <X509SubjectName>
|
||||
if ((SubjectNameList != null) && (SubjectNameList.Count > 0)) {
|
||||
foreach (string subject in SubjectNameList) {
|
||||
XmlElement sn = document.CreateElement (XmlSignature.ElementNames.X509SubjectName, XmlSignature.NamespaceURI);
|
||||
sn.InnerText = subject;
|
||||
xel.AppendChild (sn);
|
||||
}
|
||||
}
|
||||
// <X509Certificate>
|
||||
if ((X509CertificateList != null) && (X509CertificateList.Count > 0)) {
|
||||
foreach (X509Certificate x509 in X509CertificateList) {
|
||||
XmlElement cert = document.CreateElement (XmlSignature.ElementNames.X509Certificate, XmlSignature.NamespaceURI);
|
||||
cert.InnerText = Convert.ToBase64String (x509.GetRawCertData ());
|
||||
xel.AppendChild (cert);
|
||||
}
|
||||
}
|
||||
// only one <X509CRL>
|
||||
if (x509crl != null) {
|
||||
XmlElement crl = document.CreateElement (XmlSignature.ElementNames.X509CRL, XmlSignature.NamespaceURI);
|
||||
crl.InnerText = Convert.ToBase64String (x509crl);
|
||||
xel.AppendChild (crl);
|
||||
}
|
||||
return xel;
|
||||
}
|
||||
|
||||
public override void LoadXml (XmlElement element)
|
||||
{
|
||||
if (element == null)
|
||||
throw new ArgumentNullException ("element");
|
||||
|
||||
if (IssuerSerialList != null)
|
||||
IssuerSerialList.Clear ();
|
||||
if (SubjectKeyIdList != null)
|
||||
SubjectKeyIdList.Clear ();
|
||||
if (SubjectNameList != null)
|
||||
SubjectNameList.Clear ();
|
||||
if (X509CertificateList != null)
|
||||
X509CertificateList.Clear ();
|
||||
x509crl = null;
|
||||
|
||||
if ((element.LocalName != XmlSignature.ElementNames.X509Data) || (element.NamespaceURI != XmlSignature.NamespaceURI))
|
||||
throw new CryptographicException ("element");
|
||||
|
||||
XmlElement [] xnl = null;
|
||||
// <X509IssuerSerial>
|
||||
xnl = XmlSignature.GetChildElements (element, XmlSignature.ElementNames.X509IssuerSerial);
|
||||
if (xnl != null) {
|
||||
for (int i=0; i < xnl.Length; i++) {
|
||||
XmlElement xel = (XmlElement) xnl[i];
|
||||
XmlElement issuer = XmlSignature.GetChildElement (xel, XmlSignature.ElementNames.X509IssuerName, XmlSignature.NamespaceURI);
|
||||
XmlElement serial = XmlSignature.GetChildElement (xel, XmlSignature.ElementNames.X509SerialNumber, XmlSignature.NamespaceURI);
|
||||
AddIssuerSerial (issuer.InnerText, serial.InnerText);
|
||||
}
|
||||
}
|
||||
// <X509SKI>
|
||||
xnl = XmlSignature.GetChildElements (element, XmlSignature.ElementNames.X509SKI);
|
||||
if (xnl != null) {
|
||||
for (int i=0; i < xnl.Length; i++) {
|
||||
byte[] skid = Convert.FromBase64String (xnl[i].InnerXml);
|
||||
AddSubjectKeyId (skid);
|
||||
}
|
||||
}
|
||||
// <X509SubjectName>
|
||||
xnl = XmlSignature.GetChildElements (element, XmlSignature.ElementNames.X509SubjectName);
|
||||
if (xnl != null) {
|
||||
for (int i=0; i < xnl.Length; i++) {
|
||||
AddSubjectName (xnl[i].InnerXml);
|
||||
}
|
||||
}
|
||||
// <X509Certificate>
|
||||
xnl = XmlSignature.GetChildElements (element, XmlSignature.ElementNames.X509Certificate);
|
||||
if (xnl != null) {
|
||||
for (int i=0; i < xnl.Length; i++) {
|
||||
byte[] cert = Convert.FromBase64String (xnl[i].InnerXml);
|
||||
AddCertificate (new X509Certificate (cert));
|
||||
}
|
||||
}
|
||||
// only one <X509CRL>
|
||||
XmlElement x509el = XmlSignature.GetChildElement (element, XmlSignature.ElementNames.X509CRL, XmlSignature.NamespaceURI);
|
||||
if (x509el != null) {
|
||||
x509crl = Convert.FromBase64String (x509el.InnerXml);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,119 +0,0 @@
|
||||
//
|
||||
// Manifest.cs - Manifest implementation for XML Signature
|
||||
//
|
||||
// Author:
|
||||
// Sebastien Pouliot <[email protected]>
|
||||
//
|
||||
// (C) 2004 Novell (http://www.novell.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System.Collections;
|
||||
using System.Xml;
|
||||
|
||||
namespace System.Security.Cryptography.Xml {
|
||||
|
||||
internal class Manifest {
|
||||
|
||||
private ArrayList references;
|
||||
private string id;
|
||||
private XmlElement element;
|
||||
|
||||
public Manifest ()
|
||||
{
|
||||
references = new ArrayList ();
|
||||
}
|
||||
|
||||
public Manifest (XmlElement xel) : this ()
|
||||
{
|
||||
LoadXml (xel);
|
||||
}
|
||||
|
||||
public string Id {
|
||||
get { return id; }
|
||||
set {
|
||||
element = null;
|
||||
id = value;
|
||||
}
|
||||
}
|
||||
|
||||
public ArrayList References {
|
||||
get { return references; }
|
||||
}
|
||||
|
||||
public void AddReference (Reference reference)
|
||||
{
|
||||
references.Add (reference);
|
||||
}
|
||||
|
||||
public XmlElement GetXml ()
|
||||
{
|
||||
if (element != null)
|
||||
return element;
|
||||
|
||||
XmlDocument document = new XmlDocument ();
|
||||
XmlElement xel = document.CreateElement (XmlSignature.ElementNames.SignedInfo, XmlSignature.NamespaceURI);
|
||||
if (id != null)
|
||||
xel.SetAttribute (XmlSignature.AttributeNames.Id, id);
|
||||
|
||||
// we add References afterward so we don't end up with extraneous
|
||||
// xmlns="..." in each reference elements.
|
||||
foreach (Reference r in references) {
|
||||
XmlNode xn = r.GetXml ();
|
||||
XmlNode newNode = document.ImportNode (xn, true);
|
||||
xel.AppendChild (newNode);
|
||||
}
|
||||
|
||||
return xel;
|
||||
}
|
||||
|
||||
private string GetAttribute (XmlElement xel, string attribute)
|
||||
{
|
||||
XmlAttribute xa = xel.Attributes [attribute];
|
||||
return ((xa != null) ? xa.InnerText : null);
|
||||
}
|
||||
|
||||
public void LoadXml (XmlElement value)
|
||||
{
|
||||
if (value == null)
|
||||
throw new ArgumentNullException ("value");
|
||||
|
||||
if ((value.LocalName != XmlSignature.ElementNames.Manifest) || (value.NamespaceURI != XmlSignature.NamespaceURI))
|
||||
throw new CryptographicException ();
|
||||
|
||||
id = GetAttribute (value, XmlSignature.AttributeNames.Id);
|
||||
|
||||
for (int i = 0; i < value.ChildNodes.Count; i++) {
|
||||
XmlNode n = value.ChildNodes [i];
|
||||
if (n.NodeType == XmlNodeType.Element &&
|
||||
n.LocalName == XmlSignature.ElementNames.Reference &&
|
||||
n.NamespaceURI == XmlSignature.NamespaceURI) {
|
||||
Reference r = new Reference ();
|
||||
r.LoadXml ((XmlElement) n);
|
||||
AddReference (r);
|
||||
}
|
||||
}
|
||||
element = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,221 +0,0 @@
|
||||
//
|
||||
// Signature.cs - Signature implementation for XML Signature
|
||||
//
|
||||
// Author:
|
||||
// Sebastien Pouliot ([email protected])
|
||||
// Tim Coleman ([email protected])
|
||||
//
|
||||
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
|
||||
// Copyright (C) Tim Coleman, 2004
|
||||
//
|
||||
|
||||
//
|
||||
// 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.Collections;
|
||||
using System.Security.Cryptography;
|
||||
using System.Xml;
|
||||
|
||||
namespace System.Security.Cryptography.Xml {
|
||||
|
||||
public class Signature {
|
||||
static XmlNamespaceManager dsigNsmgr;
|
||||
|
||||
static Signature ()
|
||||
{
|
||||
dsigNsmgr = new XmlNamespaceManager (new NameTable ());
|
||||
dsigNsmgr.AddNamespace ("xd", XmlSignature.NamespaceURI);
|
||||
}
|
||||
|
||||
private ArrayList list;
|
||||
private SignedInfo info;
|
||||
private KeyInfo key;
|
||||
private string id;
|
||||
private byte[] signature;
|
||||
private XmlElement element;
|
||||
|
||||
public Signature ()
|
||||
{
|
||||
list = new ArrayList ();
|
||||
}
|
||||
|
||||
public string Id {
|
||||
get { return id; }
|
||||
set {
|
||||
element = null;
|
||||
id = value;
|
||||
}
|
||||
}
|
||||
|
||||
public KeyInfo KeyInfo {
|
||||
get { return key; }
|
||||
set {
|
||||
element = null;
|
||||
key = value;
|
||||
}
|
||||
}
|
||||
|
||||
public IList ObjectList {
|
||||
get { return list; }
|
||||
set { list = ArrayList.Adapter (value); }
|
||||
}
|
||||
|
||||
public byte[] SignatureValue {
|
||||
get { return signature; }
|
||||
set {
|
||||
element = null;
|
||||
signature = value;
|
||||
}
|
||||
}
|
||||
|
||||
public SignedInfo SignedInfo {
|
||||
get { return info; }
|
||||
set {
|
||||
element = null;
|
||||
info = value;
|
||||
}
|
||||
}
|
||||
|
||||
public void AddObject (DataObject dataObject)
|
||||
{
|
||||
list.Add (dataObject);
|
||||
}
|
||||
|
||||
public XmlElement GetXml ()
|
||||
{
|
||||
return GetXml (null);
|
||||
}
|
||||
|
||||
internal XmlElement GetXml (XmlDocument document)
|
||||
{
|
||||
if (element != null)
|
||||
return element;
|
||||
|
||||
if (info == null)
|
||||
throw new CryptographicException ("SignedInfo");
|
||||
if (signature == null)
|
||||
throw new CryptographicException ("SignatureValue");
|
||||
|
||||
if (document == null)
|
||||
document = new XmlDocument ();
|
||||
|
||||
XmlElement xel = document.CreateElement (XmlSignature.ElementNames.Signature, XmlSignature.NamespaceURI);
|
||||
if (id != null)
|
||||
xel.SetAttribute (XmlSignature.AttributeNames.Id, id);
|
||||
|
||||
XmlNode xn = info.GetXml ();
|
||||
XmlNode newNode = document.ImportNode (xn, true);
|
||||
xel.AppendChild (newNode);
|
||||
|
||||
if (signature != null) {
|
||||
XmlElement sv = document.CreateElement (XmlSignature.ElementNames.SignatureValue, XmlSignature.NamespaceURI);
|
||||
sv.InnerText = Convert.ToBase64String (signature);
|
||||
xel.AppendChild (sv);
|
||||
}
|
||||
|
||||
if (key != null) {
|
||||
xn = key.GetXml ();
|
||||
newNode = document.ImportNode (xn, true);
|
||||
xel.AppendChild (newNode);
|
||||
}
|
||||
|
||||
if (list.Count > 0) {
|
||||
foreach (DataObject obj in list) {
|
||||
xn = obj.GetXml ();
|
||||
newNode = document.ImportNode (xn, true);
|
||||
xel.AppendChild (newNode);
|
||||
}
|
||||
}
|
||||
|
||||
return xel;
|
||||
}
|
||||
|
||||
private string GetAttribute (XmlElement xel, string attribute)
|
||||
{
|
||||
XmlAttribute xa = xel.Attributes [attribute];
|
||||
return ((xa != null) ? xa.InnerText : null);
|
||||
}
|
||||
|
||||
public void LoadXml (XmlElement value)
|
||||
{
|
||||
if (value == null)
|
||||
throw new ArgumentNullException ("value");
|
||||
|
||||
if ((value.LocalName == XmlSignature.ElementNames.Signature) && (value.NamespaceURI == XmlSignature.NamespaceURI)) {
|
||||
id = GetAttribute (value, XmlSignature.AttributeNames.Id);
|
||||
|
||||
// LAMESPEC: This library is totally useless against eXtensibly Marked-up document.
|
||||
int i = NextElementPos (value.ChildNodes, 0, XmlSignature.ElementNames.SignedInfo, XmlSignature.NamespaceURI, true);
|
||||
XmlElement sinfo = (XmlElement) value.ChildNodes [i];
|
||||
info = new SignedInfo ();
|
||||
info.LoadXml (sinfo);
|
||||
|
||||
i = NextElementPos (value.ChildNodes, ++i, XmlSignature.ElementNames.SignatureValue, XmlSignature.NamespaceURI, true);
|
||||
XmlElement sigValue = (XmlElement) value.ChildNodes [i];
|
||||
signature = Convert.FromBase64String (sigValue.InnerText);
|
||||
|
||||
// signature isn't required: <element ref="ds:KeyInfo" minOccurs="0"/>
|
||||
i = NextElementPos (value.ChildNodes, ++i, XmlSignature.ElementNames.KeyInfo, XmlSignature.NamespaceURI, false);
|
||||
if (i > 0) {
|
||||
XmlElement kinfo = (XmlElement) value.ChildNodes [i];
|
||||
key = new KeyInfo ();
|
||||
key.LoadXml (kinfo);
|
||||
}
|
||||
|
||||
XmlNodeList xnl = value.SelectNodes ("xd:Object", dsigNsmgr);
|
||||
foreach (XmlElement xn in xnl) {
|
||||
DataObject obj = new DataObject ();
|
||||
obj.LoadXml (xn);
|
||||
AddObject (obj);
|
||||
}
|
||||
}
|
||||
else
|
||||
throw new CryptographicException ("Malformed element: Signature.");
|
||||
|
||||
// if invalid
|
||||
if (info == null)
|
||||
throw new CryptographicException ("SignedInfo");
|
||||
if (signature == null)
|
||||
throw new CryptographicException ("SignatureValue");
|
||||
}
|
||||
|
||||
private int NextElementPos (XmlNodeList nl, int pos, string name, string ns, bool required)
|
||||
{
|
||||
while (pos < nl.Count) {
|
||||
if (nl [pos].NodeType == XmlNodeType.Element) {
|
||||
if (nl [pos].LocalName != name || nl [pos].NamespaceURI != ns) {
|
||||
if (required)
|
||||
throw new CryptographicException ("Malformed element " + name);
|
||||
else
|
||||
return -2;
|
||||
}
|
||||
else
|
||||
return pos;
|
||||
}
|
||||
else
|
||||
pos++;
|
||||
}
|
||||
if (required)
|
||||
throw new CryptographicException ("Malformed element " + name);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,219 +0,0 @@
|
||||
//
|
||||
// SignedInfo.cs - SignedInfo implementation for XML Signature
|
||||
//
|
||||
// Author:
|
||||
// Sebastien Pouliot <[email protected]>
|
||||
// Tim Coleman ([email protected])
|
||||
//
|
||||
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
|
||||
// Copyright (C) Tim Coleman, 2004
|
||||
// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System.Collections;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Xml;
|
||||
|
||||
namespace System.Security.Cryptography.Xml {
|
||||
|
||||
public class SignedInfo : ICollection, IEnumerable {
|
||||
|
||||
private ArrayList references;
|
||||
private string c14nMethod;
|
||||
private string id;
|
||||
private string signatureMethod;
|
||||
private string signatureLength;
|
||||
private XmlElement element;
|
||||
|
||||
public SignedInfo()
|
||||
{
|
||||
references = new ArrayList ();
|
||||
c14nMethod = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
|
||||
}
|
||||
|
||||
public string CanonicalizationMethod {
|
||||
get { return c14nMethod; }
|
||||
set {
|
||||
c14nMethod = value;
|
||||
element = null;
|
||||
}
|
||||
}
|
||||
|
||||
[ComVisible (false)]
|
||||
[MonoTODO]
|
||||
public Transform CanonicalizationMethodObject {
|
||||
get { throw new NotImplementedException (); }
|
||||
}
|
||||
|
||||
// documented as not supported (and throwing exception)
|
||||
public int Count {
|
||||
get { throw new NotSupportedException (); }
|
||||
}
|
||||
|
||||
public string Id {
|
||||
get { return id; }
|
||||
set {
|
||||
element = null;
|
||||
id = value;
|
||||
}
|
||||
}
|
||||
|
||||
// documented as not supported (and throwing exception)
|
||||
public bool IsReadOnly {
|
||||
get { throw new NotSupportedException (); }
|
||||
}
|
||||
|
||||
// documented as not supported (and throwing exception)
|
||||
public bool IsSynchronized {
|
||||
get { throw new NotSupportedException (); }
|
||||
}
|
||||
|
||||
// Manipulating this array never affects GetXml() when
|
||||
// LoadXml() was used.
|
||||
// (Actually, there is no way to detect modification.)
|
||||
public ArrayList References {
|
||||
get { return references; }
|
||||
}
|
||||
|
||||
public string SignatureLength {
|
||||
get { return signatureLength; }
|
||||
set {
|
||||
element = null;
|
||||
signatureLength = value;
|
||||
}
|
||||
}
|
||||
|
||||
public string SignatureMethod {
|
||||
get { return signatureMethod; }
|
||||
set {
|
||||
element = null;
|
||||
signatureMethod = value;
|
||||
}
|
||||
}
|
||||
|
||||
// documented as not supported (and throwing exception)
|
||||
public object SyncRoot {
|
||||
get { throw new NotSupportedException (); }
|
||||
}
|
||||
|
||||
public void AddReference (Reference reference)
|
||||
{
|
||||
references.Add (reference);
|
||||
}
|
||||
|
||||
// documented as not supported (and throwing exception)
|
||||
public void CopyTo (Array array, int index)
|
||||
{
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
|
||||
public IEnumerator GetEnumerator ()
|
||||
{
|
||||
return references.GetEnumerator ();
|
||||
}
|
||||
|
||||
public XmlElement GetXml ()
|
||||
{
|
||||
if (element != null)
|
||||
return element;
|
||||
|
||||
if (signatureMethod == null)
|
||||
throw new CryptographicException ("SignatureMethod");
|
||||
if (references.Count == 0)
|
||||
throw new CryptographicException ("References empty");
|
||||
|
||||
XmlDocument document = new XmlDocument ();
|
||||
XmlElement xel = document.CreateElement (XmlSignature.ElementNames.SignedInfo, XmlSignature.NamespaceURI);
|
||||
if (id != null)
|
||||
xel.SetAttribute (XmlSignature.AttributeNames.Id, id);
|
||||
|
||||
if (c14nMethod != null) {
|
||||
XmlElement c14n = document.CreateElement (XmlSignature.ElementNames.CanonicalizationMethod, XmlSignature.NamespaceURI);
|
||||
c14n.SetAttribute (XmlSignature.AttributeNames.Algorithm, c14nMethod);
|
||||
xel.AppendChild (c14n);
|
||||
}
|
||||
if (signatureMethod != null) {
|
||||
XmlElement sm = document.CreateElement (XmlSignature.ElementNames.SignatureMethod, XmlSignature.NamespaceURI);
|
||||
sm.SetAttribute (XmlSignature.AttributeNames.Algorithm, signatureMethod);
|
||||
if (signatureLength != null) {
|
||||
XmlElement hmac = document.CreateElement (XmlSignature.ElementNames.HMACOutputLength, XmlSignature.NamespaceURI);
|
||||
hmac.InnerText = signatureLength;
|
||||
sm.AppendChild (hmac);
|
||||
}
|
||||
xel.AppendChild (sm);
|
||||
}
|
||||
|
||||
// This check is only done when element is created here.
|
||||
if (references.Count == 0)
|
||||
throw new CryptographicException ("At least one Reference element is required in SignedInfo.");
|
||||
|
||||
// we add References afterward so we don't end up with extraneous
|
||||
// xmlns="..." in each reference elements.
|
||||
foreach (Reference r in references) {
|
||||
XmlNode xn = r.GetXml ();
|
||||
XmlNode newNode = document.ImportNode (xn, true);
|
||||
xel.AppendChild (newNode);
|
||||
}
|
||||
|
||||
return xel;
|
||||
}
|
||||
|
||||
private string GetAttribute (XmlElement xel, string attribute)
|
||||
{
|
||||
XmlAttribute xa = xel.Attributes [attribute];
|
||||
return ((xa != null) ? xa.InnerText : null);
|
||||
}
|
||||
|
||||
public void LoadXml (XmlElement value)
|
||||
{
|
||||
if (value == null)
|
||||
throw new ArgumentNullException ("value");
|
||||
|
||||
if ((value.LocalName != XmlSignature.ElementNames.SignedInfo) || (value.NamespaceURI != XmlSignature.NamespaceURI))
|
||||
throw new CryptographicException ();
|
||||
|
||||
id = GetAttribute (value, XmlSignature.AttributeNames.Id);
|
||||
c14nMethod = XmlSignature.GetAttributeFromElement (value, XmlSignature.AttributeNames.Algorithm, XmlSignature.ElementNames.CanonicalizationMethod);
|
||||
|
||||
XmlElement sm = XmlSignature.GetChildElement (value, XmlSignature.ElementNames.SignatureMethod, XmlSignature.NamespaceURI);
|
||||
if (sm != null) {
|
||||
signatureMethod = sm.GetAttribute (XmlSignature.AttributeNames.Algorithm);
|
||||
XmlElement length = XmlSignature.GetChildElement (sm, XmlSignature.ElementNames.HMACOutputLength, XmlSignature.NamespaceURI);
|
||||
if (length != null) {
|
||||
signatureLength = length.InnerText;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < value.ChildNodes.Count; i++) {
|
||||
XmlNode n = value.ChildNodes [i];
|
||||
if (n.NodeType == XmlNodeType.Element &&
|
||||
n.LocalName == XmlSignature.ElementNames.Reference &&
|
||||
n.NamespaceURI == XmlSignature.NamespaceURI) {
|
||||
Reference r = new Reference ();
|
||||
r.LoadXml ((XmlElement) n);
|
||||
AddReference (r);
|
||||
}
|
||||
}
|
||||
element = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,56 +0,0 @@
|
||||
//
|
||||
// X509IssuerSerial.cs - X509IssuerSerial implementation for XML Encryption
|
||||
//
|
||||
// Author:
|
||||
// Tim Coleman ([email protected])
|
||||
// Sebastien Pouliot <[email protected]>
|
||||
//
|
||||
// Copyright (C) Tim Coleman, 2004
|
||||
// Copyright (C) 2004-2005 Novell Inc. (http://www.novell.com)
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
namespace System.Security.Cryptography.Xml {
|
||||
|
||||
public
|
||||
struct X509IssuerSerial {
|
||||
|
||||
private string _issuerName;
|
||||
private string _serialNumber;
|
||||
|
||||
internal X509IssuerSerial (string issuer, string serial)
|
||||
{
|
||||
_issuerName = issuer;
|
||||
_serialNumber = serial;
|
||||
}
|
||||
|
||||
public string IssuerName {
|
||||
get { return _issuerName; }
|
||||
set { _issuerName = value; }
|
||||
}
|
||||
|
||||
public string SerialNumber {
|
||||
get { return _serialNumber; }
|
||||
set { _serialNumber = value; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loaded 100 of 550 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user