Compare commits

..
Author SHA1 Message Date
Rodrigo Kumpera 0511d99a29 Improve test assert. 2017-03-29 11:47:04 -04:00
Rodrigo Kumpera e587464d80 [System] Disable a few tests that don't work on Android. 2017-03-29 11:47:04 -04:00
Rodrigo Kumpera 406bd743d8 [System] Disable test that doesn't work on Android. 2017-03-29 11:47:04 -04:00
Rodrigo Kumpera b790bf549e [io-layer] Don't RC std handles or the current process on every lookup.
Caller don't expect those lookups to be RC'd so they don't compensate. This leads to unbound growth of their ref count, which eventually overflows.
2017-03-29 11:47:04 -04:00
Rodrigo Kumpera afbe09bbca [runtime] When looking up the process name, don't bail out if you can't load its modules.
Loading modules for other processes can fail under some linux sandboxing rules but that doesn't mean
we should not be able to compute the process name. So when module == NULL, we make module loading non-fatal.
2017-03-29 11:47:04 -04:00
Rodrigo Kumpera c98c771228 [runtime] Improve tracing of process name lookup functions. 2017-03-29 11:47:04 -04:00
Rodrigo Kumpera e6dd37fa96 [runtime] Fix compilation under Android 2017-03-29 11:47:04 -04:00
276 changed files with 2528 additions and 4448 deletions

No files matched your search

+10 -3
View File
@@ -44,6 +44,10 @@ 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/*'`
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
# Disable this for now because it is very slow and causes wrench to timeout:
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
pkgconfigdir = $(libdir)/pkgconfig
noinst_DATA = mono-uninstalled.pc
@@ -51,13 +55,16 @@ DISTCLEANFILES= mono-uninstalled.pc
# building with monolite
mcslib = $(mcs_topdir)/class/lib
monolite = $(mcslib)/monolite
monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
.PHONY: get-monolite-latest
get-monolite-latest:
-rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
-mkdir -p $(mcslib)/monolite
-rm -fr $(mcslib)/monolite-*
-mkdir -p $(mcslib)
test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old
test ! -d $(monolite) || mv -f $(monolite) $(monolite).old
cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
cd $(mcslib) && mv -f monolite-* monolite
if BITCODE
BITCODE_CHECK=yes
+19 -24
View File
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])
AC_INIT(mono, [5.2.0],
AC_INIT(mono, [5.1.0],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README.md])
@@ -63,8 +63,6 @@ esac
#
libgc_configure_args=
CFLAGS=$CFLAGS -O0 -g
# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0
CPPFLAGS_FOR_LIBGC=$CPPFLAGS
@@ -1033,25 +1031,25 @@ AC_SUBST(DEFAULT_PROFILE)
if test x$USE_NLS = xprofile_default; then
AC_MSG_CHECKING([NLS used])
if test x$host_darwin = xyes; then
# We make the default value for USE_NLS
# "no" on OSX because it isn't available on most
# default OSX installs. The most common configurations will
# all disable it, so this saves us typing.
USE_NLS=no
AC_SUBST([USE_NLS])
AC_MSG_RESULT([$USE_NLS])
else
USE_NLS=yes
AC_SUBST([USE_NLS])
AC_MSG_RESULT([$USE_NLS])
fi
# We make the default value for USE_NLS
# "no" on OSX because it isn't available on most
# default OSX installs. The most common configurations will
# all disable it, so this saves us typing.
if test x$host_darwin = xyes; then
USE_NLS=no;
else
USE_NLS=yes;
fi
AC_SUBST([USE_NLS])
AC_MSG_RESULT([$USE_NLS])
fi
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier,
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting,
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting,
security, lldb, mdb, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.],
[
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
@@ -1172,10 +1170,9 @@ if test "x$mono_feature_disable_normalization" = "xyes"; then
AC_MSG_NOTICE([Disabled String normalization support.])
fi
#TODO: remove assembly_remapping feature name once everyone is using desktop_loader
if test "x$mono_feature_disable_assembly_remapping" = "xyes" || test "x$mono_feature_disable_desktop_loader" = "xyes"; then
AC_DEFINE(DISABLE_DESKTOP_LOADER, 1, [Disable desktop assembly loader semantics.])
AC_MSG_NOTICE([Disabled desktop assembly loader semantics.])
if test "x$mono_feature_disable_assembly_remapping" = "xyes"; then
AC_DEFINE(DISABLE_ASSEMBLY_REMAPPING, 1, [Disable assembly remapping.])
AC_MSG_NOTICE([Disabled Assembly remapping.])
fi
if test "x$mono_feature_disable_shared_perfcounters" = "xyes"; then
@@ -2410,8 +2407,6 @@ if test x$host_win32 = xno; then
AC_CHECK_FUNCS(system)
AC_CHECK_FUNCS(fork execv execve)
AC_CHECK_FUNCS(accept4)
AC_CHECK_FUNCS(localtime_r)
AC_CHECK_FUNCS(mkdtemp)
AC_CHECK_SIZEOF(size_t)
AC_CHECK_TYPES([blksize_t], [AC_DEFINE(HAVE_BLKSIZE_T)], ,
[#include <sys/types.h>
@@ -3026,7 +3021,7 @@ if test "x$enable_llvm" = "xyes"; then
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=$llvm_api_version"
fi
AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraries])
AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraties])
AC_SUBST(LLVM_CFLAGS)
AC_SUBST(LLVM_CXXFLAGS)
-4
View File
@@ -82,11 +82,7 @@ g_file_test (const gchar *filename, GFileTest test)
gchar *
g_mkdtemp (char *tmp_template)
{
#ifdef HAVE_MKDTEMP
char *template_copy = g_strdup (tmp_template);
return mkdtemp (template_copy);
#else
g_error("Function not supported");
#endif
}
+1 -2
View File
@@ -160,8 +160,7 @@ typedef struct _GMemChunk GMemChunk;
* Misc.
*/
gboolean g_hasenv(const gchar *variable);
gchar * g_getenv(const gchar *variable);
const gchar * g_getenv(const gchar *variable);
gboolean g_setenv(const gchar *variable, const gchar *value, gboolean overwrite);
void g_unsetenv(const gchar *variable);
+4 -50
View File
@@ -39,69 +39,23 @@
#include <unistd.h>
#endif
static pthread_mutex_t env_lock = PTHREAD_MUTEX_INITIALIZER;
/* MONO Comment
*
* As per the UNIX spec,
* "The return value from getenv() may point to static data which may be overwritten by subsequent calls to getenv(), setenv(), or unsetenv()."
* Source: Unix Manual Pages for getenv, IEEE Std 1003.1
*
* This means that using pointers returned from getenv may (and does) lead to many
* pointers which refer to the same piece of memory. When one is freed, all will be freed.
*
* This is unsafe and an ergonomics risk to fix in the callers. While the caller could lock,
* this introduces the risk for looping or exiting while inside of a lock. For this reason,
* g_getenv does not mimic the behavior of POSIX getenv anymore.
*
* The memory address returned will be unique to the invocaton, and must be freed.
* */
gchar *
g_getenv (const gchar *variable)
const gchar *
g_getenv(const gchar *variable)
{
gchar *ret = NULL;
pthread_mutex_lock (&env_lock);
gchar *res = getenv(variable);
if (res)
ret = g_strdup(res);
pthread_mutex_unlock (&env_lock);
return ret;
}
/*
* This function checks if the given variable is non-NULL
* in the environment. It's useful because it removes memory
* freeing requirements.
*
*/
gboolean
g_hasenv (const gchar *variable)
{
pthread_mutex_lock (&env_lock);
gchar *res = getenv(variable);
gboolean not_null = (res != NULL);
pthread_mutex_unlock (&env_lock);
return not_null;
return getenv(variable);
}
gboolean
g_setenv(const gchar *variable, const gchar *value, gboolean overwrite)
{
gboolean res;
pthread_mutex_lock (&env_lock);
res = (setenv(variable, value, overwrite) == 0);
pthread_mutex_unlock (&env_lock);
return res;
return setenv(variable, value, overwrite) == 0;
}
void
g_unsetenv(const gchar *variable)
{
pthread_mutex_lock (&env_lock);
unsetenv(variable);
pthread_mutex_unlock (&env_lock);
}
gchar*
+1 -7
View File
@@ -39,13 +39,7 @@
#include <io.h>
#include <assert.h>
gboolean
g_hasenv (const gchar *variable)
{
return g_getenv (variable) != NULL;
}
gchar *
const gchar *
g_getenv(const gchar *variable)
{
gunichar2 *var, *buffer;
+1 -1
+1 -1
+1 -1
+1 -1
+3 -20
View File
@@ -311,26 +311,6 @@ Instructs the AOT compiler to emit (or not emit) debug symbol information.
For more information about AOT, see: http://www.mono-project.com/docs/advanced/aot/
.RE
.TP
\fB--aot-path=PATH\fR
List of additional directories to search for AOT images.
.TP
\fB--apply-bindings=FILE\fR
Apply the assembly bindings from the specified configuration file when running
the AOT compiler. This is useful when compiling an auxiliary assembly that is
referenced by a main assembly that provides a configuration file. For example,
if app.exe uses lib.dll then in order to make the assembly bindings from
app.exe.config available when compiling lib.dll ahead of time, use:
.nf
mono --apply-bindings=app.exe.config --aot lib.dll
.fi
.TP
\fB--assembly-loader=MODE\fR
If mode is \fBstrict\fR, Mono will check that the public key token, culture and version
of a candidate assembly matches the requested strong name. If mode is \fBlegacy\fR, as
long as the name matches, the candidate will be allowed. \fBstrict\fR is the behavior
consistent with .NET Framework but may break some existing mono-based applications.
The default is \fBlegacy\fR.
.TP
\fB--attach=[options]\fR
Currently the only option supported by this command line argument is
\fBdisable\fR which disables the attach functionality.
@@ -341,6 +321,9 @@ The default files are /etc/mono/config and ~/.mono/config or the file
specified in the MONO_CONFIG environment variable, if set. See the
mono-config(5) man page for details on the format of this file.
.TP
\fB--aot-path=PATH\fR
List of additional directories to search for AOT images.
.TP
\fB--debugger-agent=[options]\fR
This instructs the Mono runtime to
start a debugging agent inside the Mono runtime and connect it to a
+8 -9
View File
@@ -1,17 +1,15 @@
# -*- makefile -*-
monolite_path := $(topdir)/class/lib/monolite/$(MONO_CORLIB_VERSION)
with_mono_path_monolite = MONO_PATH="$(monolite_path)$(PLATFORM_PATH_SEPARATOR)$(monolite_path)/Facades$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
with_mono_path_monolite = MONO_PATH="$(topdir)/class/lib/monolite$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/monolite/Facades$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
monolite_flag := $(depsdir)/use-monolite
use_monolite := $(wildcard $(monolite_flag))
MONOLITE_MSCORLIB = $(monolite_path)/mscorlib.dll
MONOLITE_MSCORLIB = $(topdir)/class/lib/monolite/mscorlib.dll
ifdef use_monolite
ifdef MCS_MODE
CSC_LOCATION = $(monolite_path)/mcs.exe
CSC_LOCATION = $(topdir)/class/lib/monolite/mcs.exe
endif
PROFILE_RUNTIME = $(with_mono_path_monolite) $(RUNTIME)
@@ -81,7 +79,8 @@ do-profile-check: $(depsdir)/.stamp
$(MAKE) $(MAKE_Q) do-profile-check-monolite ; \
else \
echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2; \
echo "*** Check README for information on how to bootstrap a Mono installation." 1>&2 ; \
echo "*** You need Mono version 4.8 or better installed to build MCS" 1>&2 ; \
echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
exit 1; fi; fi
@@ -90,7 +89,7 @@ ifdef use_monolite
do-get-monolite:
do-profile-check-monolite:
@echo "*** The contents of your 'monolite/$(MONO_CORLIB_VERSION)' directory may be out-of-date" 1>&2
@echo "*** The contents of your 'monolite' directory may be out-of-date" 1>&2
@echo "*** You may want to try 'make get-monolite-latest'" 1>&2
rm -f $(monolite_flag)
exit 1
@@ -98,12 +97,12 @@ do-profile-check-monolite:
else
do-get-monolite:
@echo "*** Downloading bootstrap required 'monolite/$(MONO_CORLIB_VERSION)'" 1>&2
@echo "*** Downloading bootstrap required 'monolite'" 1>&2
$(MAKE) $(MAKE_Q) -C $(mono_build_root) get-monolite-latest
do-profile-check-monolite: $(depsdir)/.stamp
@echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2
@echo "*** Trying the 'monolite/$(MONO_CORLIB_VERSION)' directory." 1>&2
@echo "*** Trying the 'monolite' directory." 1>&2
@echo dummy > $(monolite_flag)
$(MAKE) do-profile-check
+3
View File
@@ -5,6 +5,9 @@ BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
@@ -5,6 +5,11 @@ BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN := $(dir $(shell which $(EXTERNAL_MCS)))resgen2
# nuttzing!
profile-check:
@:
+1 -1
View File
@@ -11,7 +11,7 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 4.5
XBUILD_VERSION = 4.0
+3 -2
View File
@@ -5,6 +5,9 @@ BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
@@ -21,7 +24,6 @@ PROFILE_MCS_FLAGS = \
-d:MOBILE,MOBILE_LEGACY \
-d:FULL_AOT_DESKTOP \
-d:FULL_AOT_RUNTIME \
-d:ORBIS \
-d:DISABLE_REMOTING \
-d:DISABLE_COM \
-nowarn:1699 \
@@ -38,7 +40,6 @@ ALWAYS_AOT = yes
MOBILE_PROFILE = yes
NO_VTS_TEST = yes
NO_CONSOLE = yes
PROFILE_DISABLE_BTLS = yes
# Note need for trailing comma. If you add, keep it
PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,
+3
View File
@@ -5,6 +5,9 @@ BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
@@ -5,6 +5,9 @@ BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
+3
View File
@@ -5,6 +5,9 @@ BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
+3
View File
@@ -3,6 +3,9 @@ BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN := $(dir $(shell which $(EXTERNAL_MCS)))resgen2
profile-check:
@:
+1 -1
View File
@@ -1,6 +1,6 @@
include $(topdir)/build/profiles/net_4_x.make
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) \
PROFILE_MCS_FLAGS += \
-d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \
-d:NO_SYSTEM_DRAWING_DEPENDENCY \
-d:NO_WINFORMS_DEPENDENCY \
+4 -2
View File
@@ -33,7 +33,7 @@ USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_M
USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
CSC_RUNTIME_FLAGS = --aot-path=$(abspath $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)) --gc-params=nursery-size=64m
CSC_RUNTIME_FLAGS = --aot-path=$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE) --gc-params=nursery-size=64m
BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
CCOMPILE = $(CC) $(USE_CFLAGS)
BOOT_COMPILE = $(Q_MCS) $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
@@ -49,7 +49,9 @@ INTERNAL_CSC_LOCATION = $(CSC_LOCATION)
# Using CSC_SDK_PATH_DISABLED for sanity check that all references have path specified
INTERNAL_CSC = CSC_SDK_PATH_DISABLED= $(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(INTERNAL_CSC_LOCATION)
RESGEN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(RESGEN_EXE) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resgen.exe
RESGEN_EXE = $(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)resgen.exe
INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(RESGEN_EXE)
RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/cil-stringreplacer.exe
depsdir = $(topdir)/build/deps
+2 -2
View File
@@ -37,8 +37,8 @@ doc-update-local:
doc-update-recursive:
@echo "do not recurse the Facades folder"
System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Numerics.Vectors System.Runtime.Serialization System.Transactions System.XML \
System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.IO.Compression.FileSystem System.Runtime.InteropServices.RuntimeInformation \
System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Runtime.Serialization System.XML \
System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.IO.Compression.FileSystem \
System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression \
System.Web.Services:
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.0.1.0")]
[assembly: AssemblyVersion ("4.0.0.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System System.Data System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
NO_TEST = yes
include $(MCS_BUILD_DIR)/library.make
@@ -1,2 +1,4 @@
TypeForwarders.cs
AssemblyInfo.cs
../../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataReaderExtensions.Facade.cs
@@ -28,7 +28,6 @@
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnection))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnectionStringBuilder))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataReader))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataReaderExtensions))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataRecord))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbEnumerator))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbException))]
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.0.2.0")]
[assembly: AssemblyVersion ("4.0.1.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -14,27 +14,10 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
# xammac_net_4_5 and the testing_* profiles are special, they don't build
# System.Drawing.dll or equivalent neither in Mono nor in the XM repo.
# For now we embed the types directly here.
# TODO: find a better solution.
EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hybrid, $(PROFILE))
ifndef EMBEDDED_DRAWING_DEP
# profiles which build a System.Drawing.dll in the repo
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot, $(PROFILE))
ifdef REPO_DRAWING_DEP
ifneq (2.1, $(FRAMEWORK_VERSION))
ifndef XAMMAC_4_5
LIB_REFS += System.Drawing
else
# When System.Drawing.dll is not built in the Mono repo but in
# the product repo like in the XI/XA case we need to pass in a reference
# to the assembly containing drawing types like Rectangle etc. from there.
# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE.
LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE)
endif
endif
PLATFORM_DEBUG_FLAGS =
@@ -6,7 +6,3 @@ AssemblyInfo.cs
../../System.Drawing/System.Drawing/RectangleF.cs
../../System.Drawing/System.Drawing/Size.cs
../../System.Drawing/System.Drawing/SizeF.cs
../../System.Drawing/System.Drawing/Color.cs
../../System.Drawing/System.Drawing/KnownColor.cs
../../System.Drawing/System.Drawing/KnownColors.cs
@@ -1 +0,0 @@
#include embedded_System.Drawing.Primitives.dll.sources
@@ -1 +0,0 @@
#include embedded_System.Drawing.Primitives.dll.sources
@@ -1,19 +0,0 @@
MCS_BUILD_DIR = ../../../build
thisdir = class/Facades/System.Reflection.DispatchProxy
SUBDIRS =
include $(MCS_BUILD_DIR)/rules.make
LIBRARY_SUBDIR = Facades
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Reflection.DispatchProxy.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
NO_TEST = yes
include $(MCS_BUILD_DIR)/library.make
@@ -1,3 +0,0 @@
../../../build/common/MonoTODOAttribute.cs
Assembly/AssemblyInfo.cs
System.Reflection/DispatchProxy.cs
@@ -1,24 +0,0 @@
MCS_BUILD_DIR = ../../../build
thisdir = class/Facades/System.Runtime.InteropServices.RuntimeInformation
SUBDIRS =
include $(MCS_BUILD_DIR)/rules.make
LIBRARY_SUBDIR = Facades
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.InteropServices.RuntimeInformation.dll
RESX_RESOURCE_STRING = ../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
NO_TEST = yes
include $(MCS_BUILD_DIR)/library.make
@@ -1,7 +0,0 @@
Assembly/AssemblyInfo.cs
System.Runtime.InteropServices/RuntimeInformation.cs
corefx/SR.cs
../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/OSPlatform.cs
../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/Architecture.cs
@@ -1,8 +0,0 @@
//
// This file was generated by resx2sr tool
//
partial class SR
{
public const string Argument_EmptyValue = "Value cannot be empty.";
}
@@ -1,39 +0,0 @@
//
// AssemblyExtensions.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2016 Xamarin Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
namespace System.Reflection.Metadata
{
public static class AssemblyExtensions
{
public static unsafe bool TryGetRawMetadata (this System.Reflection.Assembly assembly, out byte* blob, out int length)
{
throw new NotImplementedException ();
}
}
}
@@ -1,21 +0,0 @@
MCS_BUILD_DIR = ../../../build
thisdir = class/Facades/System.Runtime.Loader
SUBDIRS =
include $(MCS_BUILD_DIR)/rules.make
LIBRARY_SUBDIR = Facades
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.Loader.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
NO_TEST = yes
include $(MCS_BUILD_DIR)/library.make
@@ -1,3 +0,0 @@
AssemblyInfo.cs
AssemblyExtensions.cs
AssemblyLoadContext.cs
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.0.1.0")]
[assembly: AssemblyVersion ("4.0.0.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -1,4 +1,4 @@
TypeForwarders.cs
AssemblyInfo.cs
SR.cs
../../../../external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/IncrementalHash.net46.cs
../../../../external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/IncrementalHash.net46.cs
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.0.2.0")]
[assembly: AssemblyVersion ("4.0.1.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.1.1.0")]
[assembly: AssemblyVersion ("4.1.0.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.1.1.0")]
[assembly: AssemblyVersion ("4.1.0.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.1.1.0")]
[assembly: AssemblyVersion ("4.1.0.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.0.2.0")]
[assembly: AssemblyVersion ("4.0.1.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.0.2.0")]
[assembly: AssemblyVersion ("4.0.1.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -12,9 +12,10 @@ LIBRARY = System.Threading.Overlapped.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
LIB_MCS_FLAGS = $(SIGN_FLAGS) -unsafe -nowarn:3021
PLATFORM_DEBUG_FLAGS =
RESX_RESOURCE_STRING = \
../../../../external/corefx/src/System.Threading.Overlapped/src/Resources/Strings.resx
NO_TEST = yes
@@ -1,2 +1,10 @@
TypeForwarders.cs
AssemblyInfo.cs
corefx/SR.cs
../../../../external/corefx/src/Common/src/System/HResults.cs
../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/ClrThreadPoolBoundHandle.cs
../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/ClrThreadPoolBoundHandleOverlapped.cs
../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/ClrThreadPoolPreAllocatedOverlapped.cs
../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/DeferredDisposableLifetime.cs
@@ -22,5 +22,3 @@
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.IOCompletionCallback))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.NativeOverlapped))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.PreAllocatedOverlapped))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.ThreadPoolBoundHandle))]
@@ -0,0 +1,13 @@
//
// This file was generated by resx2sr tool
//
partial class SR
{
public const string Argument_AlreadyBoundOrSyncHandle = "'handle' has already been bound to the thread pool, or was not opened for asynchronous I/O.";
public const string Argument_InvalidHandle = "'handle' has been disposed or is an invalid handle.";
public const string Argument_NativeOverlappedAlreadyFree = "'overlapped' has already been freed.";
public const string Argument_NativeOverlappedWrongBoundHandle = "'overlapped' was not allocated by this ThreadPoolBoundHandle instance.";
public const string Argument_PreAllocatedAlreadyAllocated = "'preAllocated' is already in use.";
public const string InvalidOperation_NativeOverlappedReused = "NativeOverlapped cannot be reused for multiple operations.";
}
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.1.0.0")]
[assembly: AssemblyVersion ("4.0.10.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
@@ -1,19 +0,0 @@
MCS_BUILD_DIR = ../../../build
thisdir = class/Facades/System.Xml.XPath.XmlDocument
SUBDIRS =
include $(MCS_BUILD_DIR)/rules.make
LIBRARY_SUBDIR = Facades
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Xml.XPath.XmlDocument.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
NO_TEST = yes
include $(MCS_BUILD_DIR)/library.make
@@ -1,3 +0,0 @@
../../../build/common/MonoTODOAttribute.cs
Assembly/AssemblyInfo.cs
System.Xml/XmlDocumentXPathExtensions.cs
+5 -34
View File
@@ -9,50 +9,21 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = netstandard.dll
KEY_FILE = ../../Open.snk
LIBRARY_SNK = $(KEY_FILE)
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 /nowarn:618
LIB_REFS = System System.Xml System.Xml.Linq System.Runtime.Serialization System.Core System.Numerics System.Numerics.Vectors System.Net.Http System.Transactions \
System.IO.Compression System.Data System.ComponentModel.Composition System.IO.Compression.FileSystem Facades/System.Runtime.InteropServices.RuntimeInformation \
System.IO.Compression System.Data System.ComponentModel.Composition System.IO.Compression.FileSystem \
Facades/System.Security.Cryptography.Algorithms Facades/System.Globalization.Extensions Facades/System.Data.Common \
Facades/System.Diagnostics.StackTrace Facades/System.Runtime.Serialization.Xml Facades/System.Runtime.Serialization.Primitives \
Facades/System.Security.SecureString Facades/System.Threading.Overlapped Facades/System.Xml.XPath.XDocument
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
ifeq ($(PROFILE),xammac_net_4_5)
LIB_REFS += System.Web.Services
else ifeq (2.1, $(FRAMEWORK_VERSION))
ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_REFS += System.Web.Services
else
LIB_REFS += System.Web
LIB_REFS += System.Web System.Drawing
endif
# profiles which build a System.Drawing.dll in the repo
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot, $(PROFILE))
ifdef REPO_DRAWING_DEP
LIB_REFS += System.Drawing
else
# xammac_net_4_5 and the testing_* profiles are special, they don't build
# System.Drawing.dll or equivalent neither in Mono nor in the XM repo.
# For now we typeforward the drawing types to the System.Drawing.Primitives.dll
# facade where they are embedded.
# TODO: find a better solution.
EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hybrid, $(PROFILE))
ifdef EMBEDDED_DRAWING_DEP
LIB_REFS += Facades/System.Drawing.Primitives
else
# When System.Drawing.dll is not built in the Mono repo but in
# the product repo like in the XI/XA case we need to pass in a reference
# to the assembly containing drawing types like Rectangle etc. from there.
# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE.
LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE)
endif
endif
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
+62 -19
View File
@@ -1,9 +1,12 @@
// This file is generated from https://github.com/dotnet/standard
//
// After successful compilation copy the contents of the following file:
// obj/AnyOS.AnyCPU.Debug/netstandard/xamarin.android/netstandard.forwards.cs
// After successful compilation run following from root folder of the repo
//
// dotnetcli\dotnet.exe Tools\GenAPI.exe -assembly:bin\ref\netstandard\2.0.0.0\netstandard.dll -writer:TypeForwards
//
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.SqlServer.Server.SqlDataRecord))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.SqlServer.Server.SqlMetaData))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.CriticalHandleMinusOneIsInvalid))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.CriticalHandleZeroOrMinusOneIsInvalid))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeFileHandle))]
@@ -11,6 +14,10 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeMemoryMappedFileHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeMemoryMappedViewHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeNCryptHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeNCryptKeyHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeNCryptProviderHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeNCryptSecretHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafePipeHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeProcessHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeWaitHandle))]
@@ -40,6 +47,7 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.AppDomainUnloadedException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ApplicationException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ApplicationId))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ArgIterator))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ArgumentException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ArgumentNullException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ArgumentOutOfRangeException))]
@@ -220,7 +228,6 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.TimeZoneInfo))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.TimeZoneNotFoundException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Tuple))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.TupleExtensions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Tuple<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Tuple<,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Tuple<,,>))]
@@ -253,15 +260,6 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.UriParser))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.UriPartial))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.UriTypeConverter))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,,,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,,,,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueType))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Version))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(void))]
@@ -738,6 +736,27 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.Common.SchemaTableColumn))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.Common.SchemaTableOptionalColumn))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.Common.SupportedJoinOperators))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.ApplicationIntent))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SortOrder))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlBulkCopy))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlBulkCopyColumnMapping))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlBulkCopyColumnMappingCollection))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlBulkCopyOptions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlClientFactory))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlCommand))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlConnection))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlConnectionStringBuilder))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlDataReader))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlError))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlErrorCollection))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlInfoMessageEventArgs))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlInfoMessageEventHandler))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlParameter))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlParameterCollection))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlRowsCopiedEventArgs))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlRowsCopiedEventHandler))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlClient.SqlTransaction))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.INullable))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlAlreadyFilledException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlBinary))]
@@ -873,6 +892,7 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Tracing.EventWrittenEventArgs))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Tracing.NonEventAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.Color))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.KnownColor))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.Point))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.PointF))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.Rectangle))]
@@ -1226,6 +1246,7 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Mail.MailMessage))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Mail.MailPriority))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Mail.SendCompletedEventHandler))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Mail.SmtpAccess))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Mail.SmtpClient))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Mail.SmtpDeliveryFormat))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Mail.SmtpDeliveryMethod))]
@@ -1336,6 +1357,15 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.WebSockets.WebSocketState))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.BigInteger))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Complex))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Matrix3x2))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Matrix4x4))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Plane))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Quaternion))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector2))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector3))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector4))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.AmbiguousMatchException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Assembly))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.AssemblyAlgorithmIdAttribute))]
@@ -1525,7 +1555,6 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.SuppressIldasmAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.TaskAwaiter))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.TaskAwaiter<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.TupleElementNamesAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.TypeForwardedFromAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.TypeForwardedToAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.UnsafeValueTypeAttribute))]
@@ -1539,7 +1568,6 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptionsAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.AllowReversePInvokeCallsAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.Architecture))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.ArrayWithOffset))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.BestFitMappingAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.BStrWrapper))]
@@ -1596,13 +1624,11 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MarshalAsAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MarshalDirectiveException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.OptionalAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.OSPlatform))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.OutAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.PreserveSigAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.PrimaryInteropAssemblyAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.ProgIdAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.RuntimeEnvironment))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.RuntimeInformation))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SafeArrayRankMismatchException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SafeArrayTypeMismatchException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SafeBuffer))]
@@ -1776,6 +1802,7 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Claims.ClaimTypes))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Claims.ClaimValueTypes))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.Aes))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.AesCng))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.AesCryptoServiceProvider))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.AesManaged))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.AsnEncodedData))]
@@ -1787,6 +1814,22 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.AsymmetricSignatureDeformatter))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.AsymmetricSignatureFormatter))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CipherMode))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngAlgorithm))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngAlgorithmGroup))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngExportPolicies))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngKey))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngKeyBlobFormat))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngKeyCreationOptions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngKeyCreationParameters))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngKeyHandleOpenOptions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngKeyOpenOptions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngKeyUsages))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngProperty))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngPropertyCollection))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngPropertyOptions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngProvider))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngUIPolicy))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CngUIProtectionLevels))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CryptoConfig))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CryptographicException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CryptographicUnexpectedOperationException))]
@@ -1806,6 +1849,7 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.ECCurve))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.ECDiffieHellmanPublicKey))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.ECDsa))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.ECDsaCng))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.ECParameters))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.ECPoint))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.FromBase64Transform))]
@@ -1842,6 +1886,7 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.RijndaelManaged))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.RNGCryptoServiceProvider))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.RSA))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.RSACng))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.RSACryptoServiceProvider))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.RSAEncryptionPadding))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.RSAEncryptionPaddingMode))]
@@ -1858,18 +1903,16 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA1CryptoServiceProvider))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA1Managed))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA256))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA256CryptoServiceProvider))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA256Managed))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA384))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA384CryptoServiceProvider))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA384Managed))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA512))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA512CryptoServiceProvider))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SHA512Managed))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SignatureDescription))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.SymmetricAlgorithm))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.ToBase64Transform))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.TripleDES))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.TripleDESCng))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.TripleDESCryptoServiceProvider))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.ECDsaCertificateExtensions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.OpenFlags))]
+9 -19
View File
@@ -13,7 +13,7 @@ System.ServiceModel.Security System.Text.Encoding.Extensions System.Text.Encodin
System.Threading.Tasks System.Threading.Timer System.Threading System.Xml.ReaderWriter System.Xml.XDocument System.Xml.XmlSerializer \
System.Runtime.Handles System.ServiceModel.Duplex System.ServiceModel.NetTcp \
Microsoft.Win32.Primitives Microsoft.Win32.Registry System.AppContext System.Collections.NonGeneric System.Collections.Specialized System.ComponentModel.Primitives \
System.ComponentModel.TypeConverter System.Console System.Data.SqlClient System.Diagnostics.FileVersionInfo \
System.ComponentModel.TypeConverter System.Console System.Data.Common System.Data.SqlClient System.Diagnostics.FileVersionInfo \
System.Diagnostics.Process System.Diagnostics.TextWriterTraceListener System.Diagnostics.TraceEvent System.Diagnostics.TraceSource System.Globalization.Calendars \
System.IO.Compression.ZipFile System.IO.FileSystem System.IO.FileSystem.DriveInfo System.IO.FileSystem.Primitives \
System.IO.IsolatedStorage System.IO.MemoryMappedFiles System.IO.UnmanagedMemoryStream System.Net.AuthenticationManager System.Net.Cache \
@@ -23,33 +23,25 @@ System.Security.AccessControl System.Security.Claims System.Security.Cryptograph
System.Security.Cryptography.Encryption.Aes System.Security.Cryptography.Encryption.ECDiffieHellman System.Security.Cryptography.Encryption.ECDsa System.Security.Cryptography.Hashing \
System.Security.Cryptography.Hashing.Algorithms System.Security.Cryptography.RSA System.Security.Cryptography.RandomNumberGenerator \
System.Security.Principal.Windows System.Threading.Thread System.Threading.ThreadPool \
System.Xml.XPath System.Xml.XmlDocument System.Xml.Xsl.Primitives Microsoft.Win32.Registry.AccessControl \
System.Xml.XPath System.Xml.XmlDocument System.Xml.Xsl.Primitives Microsoft.Win32.Registry.AccessControl System.Diagnostics.StackTrace System.Globalization.Extensions \
System.IO.FileSystem.AccessControl System.Reflection.TypeExtensions System.Reflection.Emit.Lightweight System.Reflection.Emit.ILGeneration System.Reflection.Emit \
System.Threading.AccessControl System.ValueTuple \
System.Security.SecureString System.Threading.AccessControl System.Threading.Overlapped System.ValueTuple System.Xml.XPath.XDocument \
System.Security.Cryptography.Primitives System.Text.Encoding.CodePages System.IO.FileSystem.Watcher \
System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes
# common_SUBDIRS dependencies
common_DEPS_SUBDIRS = System.Security.Cryptography.X509Certificates System.ServiceModel.Primitives System.Runtime.Serialization.Primitives \
System.Runtime.Serialization.Xml System.Security.Cryptography.Algorithms System.Globalization.Extensions System.Data.Common \
System.Diagnostics.StackTrace System.Security.SecureString System.Threading.Overlapped System.Xml.XPath.XDocument System.Runtime.InteropServices.RuntimeInformation
System.Runtime.Serialization.Xml System.Security.Cryptography.Algorithms
netstandard_drawing_SUBDIRS = System.Drawing.Primitives netstandard
drawing_DEPS_SUBDIRS = System.Drawing.Primitives
monotouch_SUBDIRS = $(common_DEPS_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
# We don't build netstandard/System.Drawing.Primitives on monotouch etc. profiles by default,
# except when EXTERNAL_FACADE_DRAWING_REFERENCE is defined which allows us to build it in Mono CI
# (since the dependent drawing types are normally built in the product repos).
ifdef EXTERNAL_FACADE_DRAWING_REFERENCE
monotouch_SUBDIRS += $(netstandard_drawing_SUBDIRS)
endif
testing_aot_full_SUBDIRS = $(monotouch_SUBDIRS)
testing_aot_full_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) $(drawing_DEPS_SUBDIRS)
net_4_x_PARALLEL_SUBDIRS = $(common_SUBDIRS)
basic_PARALLEL_SUBDIRS = System.Runtime System.Reflection System.Collections System.Resources.ResourceManager System.Globalization \
@@ -77,14 +69,12 @@ monotouch_watch_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
monotouch_tv_SUBDIRS = $(monotouch_SUBDIRS)
monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
winaot_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
winaot_PARALLEL_SUBDIRS :=
orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
orbis_PARALLEL_SUBDIRS :=
mobile_only_SUBDIRS = System.Net.Ping System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp System.Security.Cryptography.Pkcs \
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy
System.Security.Cryptography.Cng
mobile_only_DEPS_SUBDIRS = System.Security.Cryptography.OpenSsl
+19 -18
View File
@@ -18,10 +18,15 @@ basic_SUBDIRS := \
System.ComponentModel.Composition.4.5 \
System.Numerics \
System.Xml.Linq \
System.Runtime.InteropServices.RuntimeInformation \
Mono.Cecil \
$(MCS_MODE_dirs) \
../tools/cil-stringreplacer
# resgen is corlib specific so we need to wait until corlib is build
# and build it just a step before first dll needs it
resgen_dir = ../tools/resgen
build_SUBDIRS := \
corlib \
Mono.Security \
@@ -32,8 +37,8 @@ build_SUBDIRS := \
System.ComponentModel.Composition.4.5 \
System.Numerics \
System.Xml.Linq \
System.Runtime.InteropServices.RuntimeInformation \
System.IO.Compression \
System.Drawing \
Mono.Cecil \
$(MCS_MODE_dirs) \
Mono.CompilerServices.SymbolWriter \
@@ -81,6 +86,9 @@ mobile_common_dirs := \
System.Xml.Serialization \
Mono.CSharp \
Microsoft.CSharp \
System.Runtime.InteropServices.RuntimeInformation \
System.Reflection.DispatchProxy \
System.Xml.XPath.XmlDocument \
System.Reflection.Context \
System.Net.Http.WinHttpHandler
@@ -107,9 +115,7 @@ monodroid_dirs := \
$(pcl_facade_dirs)
monotouch_dirs := \
$(mobile_common_dirs) \
Mono.Simd \
$(pcl_facade_dirs)
$(testing_aot_full_dirs)
monotouch_watch_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs))
monotouch_tv_dirs := $(monotouch_dirs)
@@ -125,10 +131,7 @@ monotouch_runtime_dirs := \
monotouch_watch_runtime_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_runtime_dirs))
monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs)
winaot_dirs := \
$(mobile_common_dirs) \
System.Drawing \
$(pcl_facade_dirs)
winaot_dirs := $(monotouch_dirs) System.Drawing
xammac_4_5_dirs := \
corlib \
@@ -174,6 +177,7 @@ xammac_4_5_dirs := \
System.Data.Linq \
System.Net.Http \
System.Net.Http.WebRequest \
System.Runtime.InteropServices.RuntimeInformation \
System.Reflection.Context \
System.Net.Http.WinHttpHandler \
$(pcl_facade_dirs)
@@ -188,9 +192,10 @@ net_4_x_dirs := \
System.Core \
System.Security \
System.Configuration \
System.Drawing \
$(resgen_dir) \
System.IO.Compression \
System.IO.Compression.FileSystem \
System.Drawing \
System.Transactions \
System.EnterpriseServices \
Mono.Data.Tds \
@@ -259,7 +264,8 @@ net_4_x_dirs := \
System.Net.Http.Formatting \
System.Web.Http \
System.Web.Http.SelfHost \
System.Web.Http.WebHost
System.Web.Http.WebHost \
System.Runtime.InteropServices.RuntimeInformation
# These are the subdirs which depends on libs in net_4_x_dirs
# or have proper dependencies between each other
@@ -329,11 +335,6 @@ xbuild_4_0_dirs := \
$(xbuild_2_0_dirs) \
Microsoft.Build
orbis_dirs := \
$(filter-out Microsoft.CSharp Mono.CSharp Mono.Data.Sqlite,$(mobile_common_dirs)) \
System.Drawing \
$(pcl_facade_dirs)
monodroid_SUBDIRS := $(monodroid_dirs)
monotouch_SUBDIRS := $(monotouch_dirs)
monotouch_watch_SUBDIRS := $(monotouch_watch_dirs)
@@ -351,7 +352,7 @@ net_4_x_PARALLEL_SUBDIRS := $(net_4_x_parallel_dirs)
xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
winaot_SUBDIRS := $(winaot_dirs)
orbis_SUBDIRS := $(orbis_dirs)
orbis_SUBDIRS := $(monotouch_dirs)
include ../build/rules.make
@@ -390,11 +391,11 @@ all-local $(STD_TARGETS:=-local):
all-local-aot:
monolite_dir := monolite/$(MONO_CORLIB_VERSION)
monolite_dir := monolite
# Files needed to bootstrap C# compiler
build_files = mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll System.Security.dll System.Configuration.dll \
System.Numerics.dll System.Xml.Linq.dll \
System.Numerics.dll System.Xml.Linq.dll System.Runtime.InteropServices.RuntimeInformation.dll \
Facades/System.Collections.Concurrent.dll Facades/System.Linq.dll Facades/System.Runtime.dll Facades/System.Collections.dll \
Facades/System.Reflection.Extensions.dll Facades/System.Text.Encoding.Extensions.dll Facades/System.Diagnostics.Debug.dll \
Facades/System.Reflection.Primitives.dll Facades/System.Text.Encoding.dll Facades/System.Diagnostics.Tools.dll Facades/System.Reflection.dll \
@@ -145,6 +145,7 @@
<Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\*.cs" />
<Compile Include="..\..\..\external\cecil\Mono\*.cs" />
<Compile Include="..\..\..\external\cecil\ProjectInfo.cs" />
<Compile Include="..\..\..\external\cecil\System.Security.Cryptography\*.cs" />
<Compile Include="Consts.cs" />␍ </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.
@@ -36,50 +36,46 @@ using NUnit.Framework;
namespace MonoTests.System.Linq.Expressions {
[TestFixture]
public class ExpressionTest_Loop
{
public static void Print (int arg)
{
}
public class ExpressionTest_Loop {
[Test]
public void ComplexTest ()
{
var breakLabel = Expression.Label ("LoopBreak");
var counter = Expression.Variable (typeof (int), "counter");
var breakLabel = Expression.Label ("LoopBreak");
var counter = Expression.Variable (typeof (int), "counter");
var l = Expression.Block (new[] { counter },
Expression.Assign (counter, Expression.Constant (-1)),
Expression.Loop (
Expression.Block (Expression.IfThenElse (
Expression.Equal (Expression.Assign (counter, Expression.Add (counter, Expression.Constant (1))), Expression.Constant (1000)),
Expression.Block (Expression.Break (breakLabel)),
Expression.Call (null, typeof (ExpressionTest_Loop).GetMethod ("Print", new Type[] { typeof (int) }), counter)
)),
breakLabel)
);
var l = Expression.Block (new[] { counter },
Expression.Assign (counter, Expression.Constant (-1)),
Expression.Loop (
Expression.Block (Expression.IfThenElse (
Expression.Equal (Expression.Assign (counter, Expression.Add (counter, Expression.Constant (1))), Expression.Constant (1000)),
Expression.Block (Expression.Break (breakLabel)),
Expression.Call (null, typeof (Console).GetMethod ("WriteLine", new Type[] { typeof (int) }), counter)
)),
breakLabel)
);
var res = Expression.Lambda<Action> (l).Compile ();
}
var res = Expression.Lambda<Action> (l).Compile ();
}
[Test]
public void ComplexTest_2 ()
{
var breakLabel = Expression.Label ("LoopBreak");
var counter = Expression.Variable (typeof (int), "counter");
var breakLabel = Expression.Label ("LoopBreak");
var counter = Expression.Variable (typeof (int), "counter");
var l = Expression.Block (new[] { counter },
Expression.Assign (counter, Expression.Constant(-1)),
Expression.Loop (
Expression.IfThenElse (
Expression.Equal (Expression.Assign (counter, Expression.Add (counter, Expression.Constant (1))), Expression.Constant (1000)),
Expression.Break (breakLabel),
Expression.Call (null, typeof (ExpressionTest_Loop).GetMethod ("Print", new Type[] { typeof (int) }), counter)
),
breakLabel)
);
var l = Expression.Block (new[] { counter },
Expression.Assign (counter, Expression.Constant(-1)),
Expression.Loop (
Expression.IfThenElse (
Expression.Equal (Expression.Assign (counter, Expression.Add (counter, Expression.Constant (1))), Expression.Constant (1000)),
Expression.Break (breakLabel),
Expression.Call (null, typeof (Console).GetMethod ("WriteLine", new Type[] { typeof (int) }), counter)
),
breakLabel)
);
var res = Expression.Lambda<Action> (l).Compile ();
var res = Expression.Lambda<Action> (l).Compile ();
}
}
}
@@ -151,4 +151,4 @@ ProviderTests/System.Data.SqlClient/SqlTransactionTest.cs
ProviderTests/System.Data.SqlClient/SqlConnectionStringBuilderTest.cs
ProviderTests/System.Data.SqlClient/SqlConnectionTest.cs
ProviderTests/System.Data.SqlClient/SqlParameterTest.cs
ProviderTests/System.Data.SqlClient/SqlParameterCollectionTest.cs
ProviderTests/System.Data.SqlClient/SqlParameterCollectionTest.cs
@@ -23,4 +23,4 @@ System.Data.SqlClient/SqlTransactionTest.cs
System.Data.SqlClient/SqlConnectionStringBuilderTest.cs
System.Data.SqlClient/SqlConnectionTest.cs
System.Data.SqlClient/SqlParameterTest.cs
System.Data.SqlClient/SqlParameterCollectionTest.cs
System.Data.SqlClient/SqlParameterCollectionTest.cs
@@ -60,8 +60,7 @@ namespace MonoTests.System.Data.Connected.SqlClient
{
if (conn != null)
conn.Dispose ();
if (connectionString != null)
SqlConnection.ClearAllPools ();
SqlConnection.ClearAllPools ();
}
[Test]
@@ -41,14 +41,6 @@ namespace MonoTests.System.Data.Connected.SqlClient
public class SqlParameterCollectionTest
{
EngineConfig engine;
[SetUp]
public void SetUp ()
{
engine = ConnectionManager.Instance.Sql.EngineConfig;
}
[Test]
public void CopyToTest ()
{
+1 -1
View File
@@ -291,4 +291,4 @@
../referencesource/System.Data/System/Data/SqlClient/SqlConnectionStringBuilder.cs
../referencesource/System.Data/System/Data/SqlClient/SqlUtil.cs
../referencesource/System.Data/System/Data/SqlClient/TdsEnums.cs
../referencesource/System.Data/System/Data/SqlClient/TdsParserStaticMethods.cs
../referencesource/System.Data/System/Data/SqlClient/TdsParserStaticMethods.cs
+3 -5
View File
@@ -10,12 +10,10 @@ LIB_MCS_FLAGS = /unsafe \
-resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \
-resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico
ifeq (winaot, $(PROFILE))
LIB_MCS_FLAGS += /keyfile:../msfinal.pub
else ifeq (orbis, $(PROFILE))
LIB_MCS_FLAGS += /keyfile:../msfinal.pub
else
ifneq (winaot, $(PROFILE))
LIB_MCS_FLAGS += -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS
else
LIB_MCS_FLAGS += /keyfile:../msfinal.pub
endif
TEST_LIB_REFS = System.Drawing System.Runtime.Serialization.Formatters.Soap System.Xml
@@ -1,3 +0,0 @@
Assembly/AssemblyInfo.cs
../../build/common/Consts.cs
#include netstandard.sources
@@ -1,3 +1,3 @@
Assembly/AssemblyInfo.cs
../../build/common/Consts.cs
#include netstandard.sources
#include netstandard.sources
@@ -11,4 +11,4 @@ corefx/SR.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.Buffers/src/System/Buffers/Utilities.cs
@@ -30,17 +30,13 @@ using System.Threading;
using System.Threading.Tasks;
using System.IO;
using System.Net;
using System.Runtime.ExceptionServices;
#if XAMCORE_4_0
using CFNetwork;
using CoreFoundation;
#elif XAMCORE_2_0
using CoreServices;
using CoreFoundation;
#else
using MonoTouch.CoreServices;
using MonoTouch.CoreFoundation;
#endif
namespace System.Net.Http
@@ -58,7 +54,6 @@ namespace System.Net.Http
Mutex data_mutex;
AutoResetEvent data_event;
AutoResetEvent data_read_event;
ExceptionDispatchInfo http_exception;
// The requirements are:
// * We must read at least one byte from the stream every time
@@ -82,7 +77,6 @@ namespace System.Net.Http
public CFContentStream (CFHTTPStream stream)
{
this.http_stream = stream;
this.http_stream.ErrorEvent += HandleErrorEvent;
data = new BufferData () {
Buffer = new byte [4096],
};
@@ -91,17 +85,6 @@ namespace System.Net.Http
data_mutex = new Mutex ();
}
void HandleErrorEvent (object sender, CFStream.StreamEventArgs e)
{
var gotMutex = data_mutex.WaitOne ();
if (gotMutex) {
var stream = (CFHTTPStream)sender;
if (e.EventType == CFStreamEventType.ErrorOccurred)
Volatile.Write (ref http_exception, ExceptionDispatchInfo.Capture (stream.GetError ()));
data_mutex.ReleaseMutex ();
}
}
public void ReadStreamData ()
{
data_read_event.WaitOne (); // make sure there's no pending data.
@@ -119,7 +102,6 @@ namespace System.Net.Http
data_mutex.WaitOne ();
data = null;
this.http_stream.ErrorEvent -= HandleErrorEvent;
data_mutex.ReleaseMutex ();
data_event.Set ();
@@ -129,11 +111,6 @@ namespace System.Net.Http
{
while (data_event.WaitOne ()) {
data_mutex.WaitOne ();
if (http_exception != null) {
http_exception.Throw ();
data_mutex.ReleaseMutex ();
break;
}
if (data == null || data.Length <= 0) {
data_mutex.ReleaseMutex ();
data_read_event.Set ();
@@ -51,7 +51,6 @@
<ItemGroup>
<Compile Include="..\..\..\external\corefx\src\Common\src\System\Globalization\FormatProvider.Number.cs" />
<Compile Include="..\..\..\external\corefx\src\Common\src\System\Numerics\Hashing\HashHelpers.cs" />
<Compile Include="..\..\..\external\corefx\src\System.Numerics.Vectors\src\System\MathF.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" />
@@ -0,0 +1,62 @@
//
// AssemblyInfo.cs
//
// Author:
// Alexander Köplinger ([email protected])
//
// (C) 2016 Xamarin, Inc.
//
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Reflection;
using System.Resources;
using System.Security;
using System.Security.Permissions;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about the assembly
[assembly: AssemblyTitle ("System.Reflection.DispatchProxy.dll")]
[assembly: AssemblyDescription ("System.Reflection.DispatchProxy.dll")]
[assembly: AssemblyDefaultAlias ("System.Reflection.DispatchProxy.dll")]
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: SecurityCritical]
[assembly: ComVisible (false)]
@@ -0,0 +1,11 @@
thisdir = class/System.Reflection.DispatchProxy
SUBDIRS =
include ../../build/rules.make
LIBRARY = System.Reflection.DispatchProxy.dll
LIB_REFS = System
LIB_MCS_FLAGS =
NO_TEST = yes
include ../../build/library.make
@@ -0,0 +1,5 @@
../../build/common/Consts.cs
../../build/common/Locale.cs
../../build/common/MonoTODOAttribute.cs
Assembly/AssemblyInfo.cs
System.Reflection/DispatchProxy.cs
@@ -30,17 +30,33 @@
using System;
using System.Reflection;
using System.Resources;
using System.Security;
using System.Security.Permissions;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about the assembly
[assembly: AssemblyTitle ("System.Runtime.InteropServices.RuntimeInformation.dll")]
[assembly: AssemblyDescription ("System.Runtime.InteropServices.RuntimeInformation.dll")]
[assembly: AssemblyDefaultAlias ("System.Runtime.InteropServices.RuntimeInformation.dll")]
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.0.1.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyVersion ("4.0.0.0")]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: SecurityCritical]
[assembly: ComVisible (false)]
@@ -0,0 +1,11 @@
thisdir = class/System.Runtime.InteropServices.RuntimeInformation
SUBDIRS =
include ../../build/rules.make
LIBRARY = System.Runtime.InteropServices.RuntimeInformation.dll
LIB_REFS = System
LIB_MCS_FLAGS =
NO_TEST = yes
include ../../build/library.make
@@ -0,0 +1,9 @@
// This *will be* auto-generated file
namespace System.Runtime.InteropServices
{
static class SR
{
public const string Argument_EmptyValue = "Value cannot be empty.";
}
}
@@ -0,0 +1,7 @@
../../build/common/Consts.cs
Assembly/AssemblyInfo.cs
System.Runtime.InteropServices/RuntimeInformation.cs
SR.cs
../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/OSPlatform.cs
../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/Architecture.cs
@@ -1 +0,0 @@
#include common_System.Security.dll.sources
@@ -118,7 +118,6 @@
<Compile Include="..\referencesource\System.Web\Configuration\WebLevel.cs" />
<Compile Include="..\referencesource\System.Web\Configuration\XhtmlConformanceMode.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\AppDomainProtocolHandler.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\BackgroundWorkScheduler.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\HostingEnvironmentException.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\HTTP_COOKED_URL.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\IApplicationHost.cs" />
@@ -493,7 +492,6 @@
<Compile Include="..\referencesource\System.Web\Util\AppVerifierException.cs" />
<Compile Include="..\referencesource\System.Web\Util\AssemblyUtil.cs" />
<Compile Include="..\referencesource\System.Web\Util\BinaryCompatibility.cs" />
<Compile Include="..\referencesource\System.Web\Util\CancellationTokenHelper.cs" />
<Compile Include="..\referencesource\System.Web\Util\DateTimeUtil.cs" />
<Compile Include="..\referencesource\System.Web\Util\Debug.cs" />
<Compile Include="..\referencesource\System.Web\Util\DisposableAction.cs" />
@@ -118,7 +118,6 @@
<Compile Include="..\referencesource\System.Web\Configuration\WebLevel.cs" />
<Compile Include="..\referencesource\System.Web\Configuration\XhtmlConformanceMode.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\AppDomainProtocolHandler.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\BackgroundWorkScheduler.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\HostingEnvironmentException.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\HTTP_COOKED_URL.cs" />
<Compile Include="..\referencesource\System.Web\Hosting\IApplicationHost.cs" />
@@ -493,7 +492,6 @@
<Compile Include="..\referencesource\System.Web\Util\AppVerifierException.cs" />
<Compile Include="..\referencesource\System.Web\Util\AssemblyUtil.cs" />
<Compile Include="..\referencesource\System.Web\Util\BinaryCompatibility.cs" />
<Compile Include="..\referencesource\System.Web\Util\CancellationTokenHelper.cs" />
<Compile Include="..\referencesource\System.Web\Util\DateTimeUtil.cs" />
<Compile Include="..\referencesource\System.Web\Util\Debug.cs" />
<Compile Include="..\referencesource\System.Web\Util\DisposableAction.cs" />
@@ -31,12 +31,9 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Security.Permissions;
using System.Threading;
using System.Threading.Tasks;
using System.Web.Configuration;
using System.Web.Caching;
using System.Web.Util;
@@ -56,8 +53,6 @@ namespace System.Web.Hosting {
static VirtualPathProvider vpath_provider = (HttpRuntime.AppDomainAppVirtualPath == null) ? null :
new DefaultVirtualPathProvider ();
static int busy_count;
static BackgroundWorkScheduler _backgroundWorkScheduler = null; // created on demand
static readonly Task<object> _completedTask = Task.FromResult<object>(null);
internal static bool HaveCustomVPP {
get;
@@ -217,73 +212,6 @@ namespace System.Web.Hosting {
if (Host != null)
Host.UnregisterObject (obj);
}
// Schedules a task which can run in the background, independent of any request.
// This differs from a normal ThreadPool work item in that ASP.NET can keep track
// of how many work items registered through this API are currently running, and
// the ASP.NET runtime will try not to delay AppDomain shutdown until these work
// items have finished executing.
//
// Usage notes:
// - This API cannot be called outside of an ASP.NET-managed AppDomain.
// - The caller's ExecutionContext is not flowed to the work item.
// - Scheduled work items are not guaranteed to ever execute, e.g., when AppDomain
// shutdown has already started by the time this API was called.
// - The provided CancellationToken will be signaled when the application is
// shutting down. The work item should make every effort to honor this token.
// If a work item does not honor this token and continues executing it will
// eventually be considered rogue, and the ASP.NET runtime will rudely unload
// the AppDomain without waiting for the work item to finish.
//
// This overload of QueueBackgroundWorkItem takes a void-returning callback; the
// work item will be considered finished when the callback returns.
[SecurityPermission(SecurityAction.LinkDemand, Unrestricted = true)]
public static void QueueBackgroundWorkItem(Action<CancellationToken> workItem) {
if (workItem == null) {
throw new ArgumentNullException("workItem");
}
QueueBackgroundWorkItem(ct => { workItem(ct); return _completedTask; });
}
// See documentation on the other overload for a general API overview.
//
// This overload of QueueBackgroundWorkItem takes a Task-returning callback; the
// work item will be considered finished when the returned Task transitions to a
// terminal state.
[SecurityPermission(SecurityAction.LinkDemand, Unrestricted = true)]
public static void QueueBackgroundWorkItem(Func<CancellationToken, Task> workItem) {
if (workItem == null) {
throw new ArgumentNullException("workItem");
}
if (Host == null) {
throw new InvalidOperationException(); // can only be called within an ASP.NET AppDomain
}
QueueBackgroundWorkItemInternal(workItem);
}
static void QueueBackgroundWorkItemInternal(Func<CancellationToken, Task> workItem) {
Debug.Assert(workItem != null);
BackgroundWorkScheduler scheduler = Volatile.Read(ref _backgroundWorkScheduler);
// If the scheduler doesn't exist, lazily create it, but only allow one instance to ever be published to the backing field
if (scheduler == null) {
BackgroundWorkScheduler newlyCreatedScheduler = new BackgroundWorkScheduler(UnregisterObject, WriteUnhandledException);
scheduler = Interlocked.CompareExchange(ref _backgroundWorkScheduler, newlyCreatedScheduler, null) ?? newlyCreatedScheduler;
if (scheduler == newlyCreatedScheduler) {
RegisterObject(scheduler); // Only call RegisterObject if we just created the "winning" one
}
}
scheduler.ScheduleWorkItem(workItem);
}
static void WriteUnhandledException (AppDomain appDomain, Exception exception)
{
Console.Error.WriteLine ("Error in background work item: " + exception);
}
}
}
@@ -290,7 +290,6 @@ System.Web.Hosting/AppManagerAppDomainFactory.cs
System.Web.Hosting/ApplicationInfo.cs
System.Web.Hosting/ApplicationHost.cs
System.Web.Hosting/ApplicationManager.cs
../referencesource/System.Web/Hosting/BackgroundWorkScheduler.cs
System.Web.Hosting/BareApplicationHost.cs
System.Web.Hosting/DefaultVirtualDirectory.cs
System.Web.Hosting/DefaultVirtualFile.cs
@@ -1200,7 +1199,6 @@ System.Web.UI/XhtmlMobileDocType.cs
System.Web.UI/XhtmlTextWriter.cs
System.Web.UI/XPathBinder.cs
System.Web.Util/AltSerialization.cs
../referencesource/System.Web/Util/CancellationTokenHelper.cs
System.Web.Util/DataSourceHelper.cs
System.Web.Util/DataSourceResolver.cs
System.Web.Util/FileUtils.cs
@@ -28,17 +28,35 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Reflection;
using System.Resources;
using System.Security;
using System.Security.Permissions;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about the assembly
[assembly: AssemblyTitle ("System.Xml.XPath.XmlDocument.dll")]
[assembly: AssemblyDescription ("System.Xml.XPath.XmlDocument.dll")]
[assembly: AssemblyDefaultAlias ("System.Xml.XPath.XmlDocument.dll")]
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyVersion ("4.0.2.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: SecurityCritical]
[assembly: ComVisible (false)]
@@ -0,0 +1,11 @@
thisdir = class/System.Xml.XPath.XmlDocument
SUBDIRS =
include ../../build/rules.make
LIBRARY = System.Xml.XPath.XmlDocument.dll
LIB_REFS = System System.Xml
LIB_MCS_FLAGS =
NO_TEST = yes
include ../../build/library.make
@@ -0,0 +1,5 @@
../../build/common/Consts.cs
../../build/common/Locale.cs
../../build/common/MonoTODOAttribute.cs
Assembly/AssemblyInfo.cs
System.Xml/XmlDocumentXPathExtensions.cs
+1 -2
View File
@@ -16,8 +16,7 @@ endif
RESX_RESOURCE_STRING = \
../../../external/corefx/src/System.Collections.Concurrent/src/Resources/Strings.resx \
../../../external/corefx/src/System.Collections/src/Resources/Strings.resx \
../../../external/corefx/src/System.Buffers/src/Resources/Strings.resx
../../../external/corefx/src/System.Collections/src/Resources/Strings.resx
TEST_RESOURCES = \
Test/System/test-uri-props.txt \
@@ -36,63 +36,14 @@ namespace Mono.AppleTls
*/
var certificate2 = certificate as X509Certificate2;
if (certificate2 != null)
#if MONOTOUCH
return SecIdentity.Import (certificate2);
#else
return SecImportExport.ItemImport (certificate2);
#endif
/*
* Reading Certificates from the Mac Keychain
* ==========================================
*
* Reading the private key from the keychain is a new feature introduced with
* AppleTls on XamMac and iOS. On Desktop Mono, this new feature has several
* known issues and it also did not received any testing yet. We go back to the old
* way of doing things, which is to explicitly provide an X509Certificate2 with a
* private key.
*
* Keychain Dialog Popups
* ======================
*
* When using Xamarin.Mac or Xamarin.iOS, we try to search the keychain
* for the certificate and private key.
*
* On Xamarin.iOS, this is easy because each app has its own keychain.
*
* On Xamarin.Mac, the .app package needs to be trusted via code-sign
* to get permission to access the user's keychain. [FIXME: I still have to
* research how to actually do that.] Without this, you will get a popup
* message each time, asking you whether you want to allow the app to access
* the keychain, but you can make these go away by selecting "Trust always".
*
* On Desktop Mono, this is problematic because selecting "Trust always"
* give the 'mono' binary (and thus everything you'll ever run with Mono)
* permission to retrieve the private key from the keychain.
*
* This code would also trigger constant keychain popup messages,
* which could only be suppressed by granting full trust. It also makes it
* impossible to run Mono in headless mode.
*
* SecIdentityCreate
* =================
*
* To avoid these problems, we are currently using an undocumented API
* called SecIdentityRef() to avoid using the Mac keychain whenever a
* X509Certificate2 with a private key is used.
*
* On iOS and XamMac, you can still provide the X509Certificate without
* a private key - in this case, a keychain search will be performed (and you
* may get a popup message on XamMac).
* Otherwise, we require the private key to be in the keychain.
*/
#if MOBILE
using (var secCert = new SecCertificate (certificate)) {
return SecKeyChain.FindIdentity (secCert, true);
}
#else
return null;
#endif
}
public static SecIdentity GetIdentity (X509Certificate certificate, out SecCertificate[] intermediateCerts)
+6 -115
View File
@@ -31,7 +31,6 @@
#if SECURITY_DEP && MONO_FEATURE_APPLETLS
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using Mono.Net;
@@ -199,8 +198,6 @@ namespace Mono.AppleTls {
static readonly CFString ImportExportPassphase;
static readonly CFString ImportItemIdentity;
static readonly CFString ImportExportAccess;
static readonly CFString ImportExportKeychain;
static SecIdentity ()
{
@@ -211,8 +208,6 @@ namespace Mono.AppleTls {
try {
ImportExportPassphase = CFObject.GetStringConstant (handle, "kSecImportExportPassphrase");
ImportItemIdentity = CFObject.GetStringConstant (handle, "kSecImportItemIdentity");
ImportExportAccess = CFObject.GetStringConstant (handle, "kSecImportExportAccess");
ImportExportKeychain = CFObject.GetStringConstant (handle, "kSecImportExportKeychain");
} finally {
CFObject.dlclose (handle);
}
@@ -245,46 +240,16 @@ namespace Mono.AppleTls {
}
}
internal class ImportOptions
{
#if !MONOTOUCH
public SecAccess Access {
get; set;
}
public SecKeyChain KeyChain {
get; set;
}
#endif
}
static CFDictionary CreateImportOptions (CFString password, ImportOptions options = null)
{
if (options == null)
return CFDictionary.FromObjectAndKey (password.Handle, ImportExportPassphase.Handle);
var items = new List<Tuple<IntPtr, IntPtr>> ();
items.Add (new Tuple<IntPtr, IntPtr> (ImportExportPassphase.Handle, password.Handle));
#if !MONOTOUCH
if (options.KeyChain != null)
items.Add (new Tuple<IntPtr, IntPtr> (ImportExportKeychain.Handle, options.KeyChain.Handle));
if (options.Access != null)
items.Add (new Tuple<IntPtr, IntPtr> (ImportExportAccess.Handle, options.Access.Handle));
#endif
return CFDictionary.FromKeysAndObjects (items);
}
public static SecIdentity Import (byte[] data, string password, ImportOptions options = null)
public static SecIdentity Import (byte[] data, string password)
{
if (data == null)
throw new ArgumentNullException ("data");
if (string.IsNullOrEmpty (password)) // SecPKCS12Import() doesn't allow empty passwords.
throw new ArgumentException ("password");
using (var pwstring = CFString.Create (password))
using (var optionDict = CreateImportOptions (pwstring, options)) {
using (var options = CFDictionary.FromObjectAndKey (pwstring.Handle, ImportExportPassphase.Handle)) {
CFDictionary [] array;
SecStatusCode result = SecImportExport.ImportPkcs12 (data, optionDict, out array);
SecStatusCode result = SecImportExport.ImportPkcs12 (data, options, out array);
if (result != SecStatusCode.Success)
throw new InvalidOperationException (result.ToString ());
@@ -292,7 +257,7 @@ namespace Mono.AppleTls {
}
}
public static SecIdentity Import (X509Certificate2 certificate, ImportOptions options = null)
public static SecIdentity Import (X509Certificate2 certificate)
{
if (certificate == null)
throw new ArgumentNullException ("certificate");
@@ -305,7 +270,7 @@ namespace Mono.AppleTls {
*/
var password = Guid.NewGuid ().ToString ();
var pkcs12 = certificate.Export (X509ContentType.Pfx, password);
return Import (pkcs12, password, options);
return Import (pkcs12, password);
}
~SecIdentity ()
@@ -336,7 +301,6 @@ namespace Mono.AppleTls {
partial class SecKey : INativeObject, IDisposable {
internal IntPtr handle;
internal IntPtr owner;
public SecKey (IntPtr handle, bool owns = false)
{
@@ -345,17 +309,6 @@ namespace Mono.AppleTls {
CFObject.CFRetain (handle);
}
/*
* SecItemImport() returns a SecArrayRef. We need to free the array, not the items inside it.
*
*/
internal SecKey (IntPtr handle, IntPtr owner)
{
this.handle = handle;
this.owner = owner;
CFObject.CFRetain (owner);
}
[DllImport (AppleTlsContext.SecurityLibrary, EntryPoint="SecKeyGetTypeID")]
public extern static IntPtr GetTypeID ();
@@ -378,73 +331,11 @@ namespace Mono.AppleTls {
protected virtual void Dispose (bool disposing)
{
if (owner != IntPtr.Zero) {
CFObject.CFRelease (owner);
owner = handle = IntPtr.Zero;
} else if (handle != IntPtr.Zero) {
if (handle != IntPtr.Zero){
CFObject.CFRelease (handle);
handle = IntPtr.Zero;
}
}
}
#if !MONOTOUCH
class SecAccess : INativeObject, IDisposable {
internal IntPtr handle;
public SecAccess (IntPtr handle, bool owns = false)
{
this.handle = handle;
if (!owns)
CFObject.CFRetain (handle);
}
~SecAccess ()
{
Dispose (false);
}
public IntPtr Handle {
get {
return handle;
}
}
[DllImport (AppleTlsContext.SecurityLibrary)]
extern static /* OSStatus */ SecStatusCode SecAccessCreate (/* CFStringRef */ IntPtr descriptor, /* CFArrayRef */ IntPtr trustedList, /* SecAccessRef _Nullable * */ out IntPtr accessRef);
public static SecAccess Create (string descriptor)
{
var descriptorHandle = CFString.Create (descriptor);
if (descriptorHandle == null)
throw new InvalidOperationException ();
try {
IntPtr accessRef;
var result = SecAccessCreate (descriptorHandle.Handle, IntPtr.Zero, out accessRef);
if (result != SecStatusCode.Success)
throw new InvalidOperationException (result.ToString ());
return new SecAccess (accessRef, true);
} finally {
descriptorHandle.Dispose ();
}
}
public void Dispose ()
{
Dispose (true);
GC.SuppressFinalize (this);
}
protected virtual void Dispose (bool disposing)
{
if (handle != IntPtr.Zero) {
CFObject.CFRelease (handle);
handle = IntPtr.Zero;
}
}
}
#endif
}
#endif
+1 -379
View File
@@ -9,386 +9,8 @@ namespace Mono.AppleTls {
// values are defined in Security.framework/Headers/SecBase.h
enum SecStatusCode {
Success = 0,
Unimplemented = -4,
DiskFull = -34,
IO = -36,
OpWr = -49,
Param = -50,
WritePermissions = -61,
Allocate = -108,
UserCanceled = -128,
BadReq = -909,
InternalComponent = -2070,
CoreFoundationUnknown = -4960,
NotAvailable = -25291,
ReadOnly = -25292,
AuthFailed = -25293,
NoSuchKeyChain = -25294,
InvalidKeyChain = -25295,
DuplicateKeyChain = -25296,
DuplicateItem = -25299,
ItemNotFound = -25300,
InteractionNotAllowed = -25308,
Decode = -26275,
DuplicateCallback = -25297,
InvalidCallback = -25298,
BufferTooSmall = -25301,
DataTooLarge = -25302,
NoSuchAttribute = -25303,
InvalidItemRef = -25304,
InvalidSearchRef = -25305,
NoSuchClass = -25306,
NoDefaultKeychain = -25307,
ReadOnlyAttribute = -25309,
WrongSecVersion = -25310,
KeySizeNotAllowed = -25311,
NoStorageModule = -25312,
NoCertificateModule = -25313,
NoPolicyModule = -25314,
InteractionRequired = -25315,
DataNotAvailable = -25316,
DataNotModifiable = -25317,
CreateChainFailed = -25318,
InvalidPrefsDomain = -25319,
InDarkWake = -25320,
ACLNotSimple = -25240,
PolicyNotFound = -25241,
InvalidTrustSetting = -25242,
NoAccessForItem = -25243,
InvalidOwnerEdit = -25244,
TrustNotAvailable = -25245,
UnsupportedFormat = -25256,
UnknownFormat = -25257,
KeyIsSensitive = -25258,
MultiplePrivateKeys = -25259,
PassphraseRequired = -25260,
InvalidPasswordRef = -25261,
InvalidTrustSettings = -25262,
NoTrustSettings = -25263,
Pkcs12VerifyFailure = -25264,
NotSigner = -26267,
ServiceNotAvailable = -67585,
InsufficientClientID = -67586,
DeviceReset = -67587,
DeviceFailed = -67588,
AppleAddAppACLSubject = -67589,
ApplePublicKeyIncomplete = -67590,
AppleSignatureMismatch = -67591,
AppleInvalidKeyStartDate = -67592,
AppleInvalidKeyEndDate = -67593,
ConversionError = -67594,
AppleSSLv2Rollback = -67595,
QuotaExceeded = -67596,
FileTooBig = -67597,
InvalidDatabaseBlob = -67598,
InvalidKeyBlob = -67599,
IncompatibleDatabaseBlob = -67600,
IncompatibleKeyBlob = -67601,
HostNameMismatch = -67602,
UnknownCriticalExtensionFlag = -67603,
NoBasicConstraints = -67604,
NoBasicConstraintsCA = -67605,
InvalidAuthorityKeyID = -67606,
InvalidSubjectKeyID = -67607, /* The subject key ID is not valid. */
InvalidKeyUsageForPolicy = -67608, /* The key usage is not valid for the specified policy. */
InvalidExtendedKeyUsage = -67609, /* The extended key usage is not valid. */
InvalidIDLinkage = -67610, /* The ID linkage is not valid. */
PathLengthConstraintExceeded = -67611, /* The path length constraint was exceeded. */
InvalidRoot = -67612, /* The root or anchor certificate is not valid. */
CRLExpired = -67613, /* The CRL has expired. */
CRLNotValidYet = -67614, /* The CRL is not yet valid. */
CRLNotFound = -67615, /* The CRL was not found. */
CRLServerDown = -67616, /* The CRL server is down. */
CRLBadURI = -67617, /* The CRL has a bad Uniform Resource Identifier. */
UnknownCertExtension = -67618, /* An unknown certificate extension was encountered. */
UnknownCRLExtension = -67619, /* An unknown CRL extension was encountered. */
CRLNotTrusted = -67620, /* The CRL is not trusted. */
CRLPolicyFailed = -67621, /* The CRL policy failed. */
IDPFailure = -67622, /* The issuing distribution point was not valid. */
SMIMEEmailAddressesNotFound = -67623, /* An email address mismatch was encountered. */
SMIMEBadExtendedKeyUsage = -67624, /* The appropriate extended key usage for SMIME was not found. */
SMIMEBadKeyUsage = -67625, /* The key usage is not compatible with SMIME. */
SMIMEKeyUsageNotCritical = -67626, /* The key usage extension is not marked as critical. */
SMIMENoEmailAddress = -67627, /* No email address was found in the certificate. */
SMIMESubjAltNameNotCritical = -67628, /* The subject alternative name extension is not marked as critical. */
SSLBadExtendedKeyUsage = -67629, /* The appropriate extended key usage for SSL was not found. */
OCSPBadResponse = -67630, /* The OCSP response was incorrect or could not be parsed. */
OCSPBadRequest = -67631, /* The OCSP request was incorrect or could not be parsed. */
OCSPUnavailable = -67632, /* OCSP service is unavailable. */
OCSPStatusUnrecognized = -67633, /* The OCSP server did not recognize this certificate. */
EndOfData = -67634, /* An end-of-data was detected. */
IncompleteCertRevocationCheck = -67635, /* An incomplete certificate revocation check occurred. */
NetworkFailure = -67636, /* A network failure occurred. */
OCSPNotTrustedToAnchor = -67637, /* The OCSP response was not trusted to a root or anchor certificate. */
RecordModified = -67638, /* The record was modified. */
OCSPSignatureError = -67639, /* The OCSP response had an invalid signature. */
OCSPNoSigner = -67640, /* The OCSP response had no signer. */
OCSPResponderMalformedReq = -67641, /* The OCSP responder was given a malformed request. */
OCSPResponderInternalError = -67642, /* The OCSP responder encountered an internal error. */
OCSPResponderTryLater = -67643, /* The OCSP responder is busy, try again later. */
OCSPResponderSignatureRequired = -67644, /* The OCSP responder requires a signature. */
OCSPResponderUnauthorized = -67645, /* The OCSP responder rejected this request as unauthorized. */
OCSPResponseNonceMismatch = -67646, /* The OCSP response nonce did not match the request. */
CodeSigningBadCertChainLength = -67647, /* Code signing encountered an incorrect certificate chain length. */
CodeSigningNoBasicConstraints = -67648, /* Code signing found no basic constraints. */
CodeSigningBadPathLengthConstraint = -67649, /* Code signing encountered an incorrect path length constraint. */
CodeSigningNoExtendedKeyUsage = -67650, /* Code signing found no extended key usage. */
CodeSigningDevelopment = -67651, /* Code signing indicated use of a development-only certificate. */
ResourceSignBadCertChainLength = -67652, /* Resource signing has encountered an incorrect certificate chain length. */
ResourceSignBadExtKeyUsage = -67653, /* Resource signing has encountered an error in the extended key usage. */
TrustSettingDeny = -67654, /* The trust setting for this policy was set to Deny. */
InvalidSubjectName = -67655, /* An invalid certificate subject name was encountered. */
UnknownQualifiedCertStatement = -67656, /* An unknown qualified certificate statement was encountered. */
MobileMeRequestQueued = -67657, /* The MobileMe request will be sent during the next connection. */
MobileMeRequestRedirected = -67658, /* The MobileMe request was redirected. */
MobileMeServerError = -67659, /* A MobileMe server error occurred. */
MobileMeServerNotAvailable = -67660, /* The MobileMe server is not available. */
MobileMeServerAlreadyExists = -67661, /* The MobileMe server reported that the item already exists. */
MobileMeServerServiceErr = -67662, /* A MobileMe service error has occurred. */
MobileMeRequestAlreadyPending = -67663, /* A MobileMe request is already pending. */
MobileMeNoRequestPending = -67664, /* MobileMe has no request pending. */
MobileMeCSRVerifyFailure = -67665, /* A MobileMe CSR verification failure has occurred. */
MobileMeFailedConsistencyCheck = -67666, /* MobileMe has found a failed consistency check. */
NotInitialized = -67667, /* A function was called without initializing CSSM. */
InvalidHandleUsage = -67668, /* The CSSM handle does not match with the service type. */
PVCReferentNotFound = -67669, /* A reference to the calling module was not found in the list of authorized callers. */
FunctionIntegrityFail = -67670, /* A function address was not within the verified module. */
InternalError = -67671, /* An internal error has occurred. */
MemoryError = -67672, /* A memory error has occurred. */
InvalidData = -67673, /* Invalid data was encountered. */
MDSError = -67674, /* A Module Directory Service error has occurred. */
InvalidPointer = -67675, /* An invalid pointer was encountered. */
SelfCheckFailed = -67676, /* Self-check has failed. */
FunctionFailed = -67677, /* A function has failed. */
ModuleManifestVerifyFailed = -67678, /* A module manifest verification failure has occurred. */
InvalidGUID = -67679, /* An invalid GUID was encountered. */
InvalidHandle = -67680, /* An invalid handle was encountered. */
InvalidDBList = -67681, /* An invalid DB list was encountered. */
InvalidPassthroughID = -67682, /* An invalid passthrough ID was encountered. */
InvalidNetworkAddress = -67683, /* An invalid network address was encountered. */
CRLAlreadySigned = -67684, /* The certificate revocation list is already signed. */
InvalidNumberOfFields = -67685, /* An invalid number of fields were encountered. */
VerificationFailure = -67686, /* A verification failure occurred. */
UnknownTag = -67687, /* An unknown tag was encountered. */
InvalidSignature = -67688, /* An invalid signature was encountered. */
InvalidName = -67689, /* An invalid name was encountered. */
InvalidCertificateRef = -67690, /* An invalid certificate reference was encountered. */
InvalidCertificateGroup = -67691, /* An invalid certificate group was encountered. */
TagNotFound = -67692, /* The specified tag was not found. */
InvalidQuery = -67693, /* The specified query was not valid. */
InvalidValue = -67694, /* An invalid value was detected. */
CallbackFailed = -67695, /* A callback has failed. */
ACLDeleteFailed = -67696, /* An ACL delete operation has failed. */
ACLReplaceFailed = -67697, /* An ACL replace operation has failed. */
ACLAddFailed = -67698, /* An ACL add operation has failed. */
ACLChangeFailed = -67699, /* An ACL change operation has failed. */
InvalidAccessCredentials = -67700, /* Invalid access credentials were encountered. */
InvalidRecord = -67701, /* An invalid record was encountered. */
InvalidACL = -67702, /* An invalid ACL was encountered. */
InvalidSampleValue = -67703, /* An invalid sample value was encountered. */
IncompatibleVersion = -67704, /* An incompatible version was encountered. */
PrivilegeNotGranted = -67705, /* The privilege was not granted. */
InvalidScope = -67706, /* An invalid scope was encountered. */
PVCAlreadyConfigured = -67707, /* The PVC is already configured. */
InvalidPVC = -67708, /* An invalid PVC was encountered. */
EMMLoadFailed = -67709, /* The EMM load has failed. */
EMMUnloadFailed = -67710, /* The EMM unload has failed. */
AddinLoadFailed = -67711, /* The add-in load operation has failed. */
InvalidKeyRef = -67712, /* An invalid key was encountered. */
InvalidKeyHierarchy = -67713, /* An invalid key hierarchy was encountered. */
AddinUnloadFailed = -67714, /* The add-in unload operation has failed. */
LibraryReferenceNotFound = -67715, /* A library reference was not found. */
InvalidAddinFunctionTable = -67716, /* An invalid add-in function table was encountered. */
InvalidServiceMask = -67717, /* An invalid service mask was encountered. */
ModuleNotLoaded = -67718, /* A module was not loaded. */
InvalidSubServiceID = -67719, /* An invalid subservice ID was encountered. */
AttributeNotInContext = -67720, /* An attribute was not in the context. */
ModuleManagerInitializeFailed = -67721, /* A module failed to initialize. */
ModuleManagerNotFound = -67722, /* A module was not found. */
EventNotificationCallbackNotFound = -67723, /* An event notification callback was not found. */
InputLengthError = -67724, /* An input length error was encountered. */
OutputLengthError = -67725, /* An output length error was encountered. */
PrivilegeNotSupported = -67726, /* The privilege is not supported. */
DeviceError = -67727, /* A device error was encountered. */
AttachHandleBusy = -67728, /* The CSP handle was busy. */
NotLoggedIn = -67729, /* You are not logged in. */
AlgorithmMismatch = -67730, /* An algorithm mismatch was encountered. */
KeyUsageIncorrect = -67731, /* The key usage is incorrect. */
KeyBlobTypeIncorrect = -67732, /* The key blob type is incorrect. */
KeyHeaderInconsistent = -67733, /* The key header is inconsistent. */
UnsupportedKeyFormat = -67734, /* The key header format is not supported. */
UnsupportedKeySize = -67735, /* The key size is not supported. */
InvalidKeyUsageMask = -67736, /* The key usage mask is not valid. */
UnsupportedKeyUsageMask = -67737, /* The key usage mask is not supported. */
InvalidKeyAttributeMask = -67738, /* The key attribute mask is not valid. */
UnsupportedKeyAttributeMask = -67739, /* The key attribute mask is not supported. */
InvalidKeyLabel = -67740, /* The key label is not valid. */
UnsupportedKeyLabel = -67741, /* The key label is not supported. */
InvalidKeyFormat = -67742, /* The key format is not valid. */
UnsupportedVectorOfBuffers = -67743, /* The vector of buffers is not supported. */
InvalidInputVector = -67744, /* The input vector is not valid. */
InvalidOutputVector = -67745, /* The output vector is not valid. */
InvalidContext = -67746, /* An invalid context was encountered. */
InvalidAlgorithm = -67747, /* An invalid algorithm was encountered. */
InvalidAttributeKey = -67748, /* A key attribute was not valid. */
MissingAttributeKey = -67749, /* A key attribute was missing. */
InvalidAttributeInitVector = -67750, /* An init vector attribute was not valid. */
MissingAttributeInitVector = -67751, /* An init vector attribute was missing. */
InvalidAttributeSalt = -67752, /* A salt attribute was not valid. */
MissingAttributeSalt = -67753, /* A salt attribute was missing. */
InvalidAttributePadding = -67754, /* A padding attribute was not valid. */
MissingAttributePadding = -67755, /* A padding attribute was missing. */
InvalidAttributeRandom = -67756, /* A random number attribute was not valid. */
MissingAttributeRandom = -67757, /* A random number attribute was missing. */
InvalidAttributeSeed = -67758, /* A seed attribute was not valid. */
MissingAttributeSeed = -67759, /* A seed attribute was missing. */
InvalidAttributePassphrase = -67760, /* A passphrase attribute was not valid. */
MissingAttributePassphrase = -67761, /* A passphrase attribute was missing. */
InvalidAttributeKeyLength = -67762, /* A key length attribute was not valid. */
MissingAttributeKeyLength = -67763, /* A key length attribute was missing. */
InvalidAttributeBlockSize = -67764, /* A block size attribute was not valid. */
MissingAttributeBlockSize = -67765, /* A block size attribute was missing. */
InvalidAttributeOutputSize = -67766, /* An output size attribute was not valid. */
MissingAttributeOutputSize = -67767, /* An output size attribute was missing. */
InvalidAttributeRounds = -67768, /* The number of rounds attribute was not valid. */
MissingAttributeRounds = -67769, /* The number of rounds attribute was missing. */
InvalidAlgorithmParms = -67770, /* An algorithm parameters attribute was not valid. */
MissingAlgorithmParms = -67771, /* An algorithm parameters attribute was missing. */
InvalidAttributeLabel = -67772, /* A label attribute was not valid. */
MissingAttributeLabel = -67773, /* A label attribute was missing. */
InvalidAttributeKeyType = -67774, /* A key type attribute was not valid. */
MissingAttributeKeyType = -67775, /* A key type attribute was missing. */
InvalidAttributeMode = -67776, /* A mode attribute was not valid. */
MissingAttributeMode = -67777, /* A mode attribute was missing. */
InvalidAttributeEffectiveBits = -67778, /* An effective bits attribute was not valid. */
MissingAttributeEffectiveBits = -67779, /* An effective bits attribute was missing. */
InvalidAttributeStartDate = -67780, /* A start date attribute was not valid. */
MissingAttributeStartDate = -67781, /* A start date attribute was missing. */
InvalidAttributeEndDate = -67782, /* An end date attribute was not valid. */
MissingAttributeEndDate = -67783, /* An end date attribute was missing. */
InvalidAttributeVersion = -67784, /* A version attribute was not valid. */
MissingAttributeVersion = -67785, /* A version attribute was missing. */
InvalidAttributePrime = -67786, /* A prime attribute was not valid. */
MissingAttributePrime = -67787, /* A prime attribute was missing. */
InvalidAttributeBase = -67788, /* A base attribute was not valid. */
MissingAttributeBase = -67789, /* A base attribute was missing. */
InvalidAttributeSubprime = -67790, /* A subprime attribute was not valid. */
MissingAttributeSubprime = -67791, /* A subprime attribute was missing. */
InvalidAttributeIterationCount = -67792, /* An iteration count attribute was not valid. */
MissingAttributeIterationCount = -67793, /* An iteration count attribute was missing. */
InvalidAttributeDLDBHandle = -67794, /* A database handle attribute was not valid. */
MissingAttributeDLDBHandle = -67795, /* A database handle attribute was missing. */
InvalidAttributeAccessCredentials = -67796, /* An access credentials attribute was not valid. */
MissingAttributeAccessCredentials = -67797, /* An access credentials attribute was missing. */
InvalidAttributePublicKeyFormat = -67798, /* A public key format attribute was not valid. */
MissingAttributePublicKeyFormat = -67799, /* A public key format attribute was missing. */
InvalidAttributePrivateKeyFormat = -67800, /* A private key format attribute was not valid. */
MissingAttributePrivateKeyFormat = -67801, /* A private key format attribute was missing. */
InvalidAttributeSymmetricKeyFormat = -67802, /* A symmetric key format attribute was not valid. */
MissingAttributeSymmetricKeyFormat = -67803, /* A symmetric key format attribute was missing. */
InvalidAttributeWrappedKeyFormat = -67804, /* A wrapped key format attribute was not valid. */
MissingAttributeWrappedKeyFormat = -67805, /* A wrapped key format attribute was missing. */
StagedOperationInProgress = -67806, /* A staged operation is in progress. */
StagedOperationNotStarted = -67807, /* A staged operation was not started. */
VerifyFailed = -67808, /* A cryptographic verification failure has occurred. */
QuerySizeUnknown = -67809, /* The query size is unknown. */
BlockSizeMismatch = -67810, /* A block size mismatch occurred. */
PublicKeyInconsistent = -67811, /* The public key was inconsistent. */
DeviceVerifyFailed = -67812, /* A device verification failure has occurred. */
InvalidLoginName = -67813, /* An invalid login name was detected. */
AlreadyLoggedIn = -67814, /* The user is already logged in. */
InvalidDigestAlgorithm = -67815, /* An invalid digest algorithm was detected. */
InvalidCRLGroup = -67816, /* An invalid CRL group was detected. */
CertificateCannotOperate = -67817, /* The certificate cannot operate. */
CertificateExpired = -67818, /* An expired certificate was detected. */
CertificateNotValidYet = -67819, /* The certificate is not yet valid. */
CertificateRevoked = -67820, /* The certificate was revoked. */
CertificateSuspended = -67821, /* The certificate was suspended. */
InsufficientCredentials = -67822, /* Insufficient credentials were detected. */
InvalidAction = -67823, /* The action was not valid. */
InvalidAuthority = -67824, /* The authority was not valid. */
VerifyActionFailed = -67825, /* A verify action has failed. */
InvalidCertAuthority = -67826, /* The certificate authority was not valid. */
InvalidCRLAuthority = -67827, /* The CRL authority was not valid. */
#if MONOMAC
[Obsolete ("Use InvalidCRLAuthority")]
InvaldCRLAuthority = InvalidCRLAuthority,
#endif
InvalidCRLEncoding = -67828, /* The CRL encoding was not valid. */
InvalidCRLType = -67829, /* The CRL type was not valid. */
InvalidCRL = -67830, /* The CRL was not valid. */
InvalidFormType = -67831, /* The form type was not valid. */
InvalidID = -67832, /* The ID was not valid. */
InvalidIdentifier = -67833, /* The identifier was not valid. */
InvalidIndex = -67834, /* The index was not valid. */
InvalidPolicyIdentifiers = -67835, /* The policy identifiers are not valid. */
InvalidTimeString = -67836, /* The time specified was not valid. */
InvalidReason = -67837, /* The trust policy reason was not valid. */
InvalidRequestInputs = -67838, /* The request inputs are not valid. */
InvalidResponseVector = -67839, /* The response vector was not valid. */
InvalidStopOnPolicy = -67840, /* The stop-on policy was not valid. */
InvalidTuple = -67841, /* The tuple was not valid. */
MultipleValuesUnsupported = -67842, /* Multiple values are not supported. */
NotTrusted = -67843, /* The trust policy was not trusted. */
NoDefaultAuthority = -67844, /* No default authority was detected. */
RejectedForm = -67845, /* The trust policy had a rejected form. */
RequestLost = -67846, /* The request was lost. */
RequestRejected = -67847, /* The request was rejected. */
UnsupportedAddressType = -67848, /* The address type is not supported. */
UnsupportedService = -67849, /* The service is not supported. */
InvalidTupleGroup = -67850, /* The tuple group was not valid. */
InvalidBaseACLs = -67851, /* The base ACLs are not valid. */
InvalidTupleCredentials = -67852, /* The tuple credentials are not valid. */
#if MONOMAC
[Obsolete ("Use InvalidTupleCredentials")]
InvalidTupleCredendtials = InvalidTupleCredentials,
#endif
InvalidEncoding = -67853, /* The encoding was not valid. */
InvalidValidityPeriod = -67854, /* The validity period was not valid. */
InvalidRequestor = -67855, /* The requestor was not valid. */
RequestDescriptor = -67856, /* The request descriptor was not valid. */
InvalidBundleInfo = -67857, /* The bundle information was not valid. */
InvalidCRLIndex = -67858, /* The CRL index was not valid. */
NoFieldValues = -67859, /* No field values were detected. */
UnsupportedFieldFormat = -67860, /* The field format is not supported. */
UnsupportedIndexInfo = -67861, /* The index information is not supported. */
UnsupportedLocality = -67862, /* The locality is not supported. */
UnsupportedNumAttributes = -67863, /* The number of attributes is not supported. */
UnsupportedNumIndexes = -67864, /* The number of indexes is not supported. */
UnsupportedNumRecordTypes = -67865, /* The number of record types is not supported. */
FieldSpecifiedMultiple = -67866, /* Too many fields were specified. */
IncompatibleFieldFormat = -67867, /* The field format was incompatible. */
InvalidParsingModule = -67868, /* The parsing module was not valid. */
DatabaseLocked = -67869, /* The database is locked. */
DatastoreIsOpen = -67870, /* The data store is open. */
MissingValue = -67871, /* A missing value was detected. */
UnsupportedQueryLimits = -67872, /* The query limits are not supported. */
UnsupportedNumSelectionPreds = -67873, /* The number of selection predicates is not supported. */
UnsupportedOperator = -67874, /* The operator is not supported. */
InvalidDBLocation = -67875, /* The database location is not valid. */
InvalidAccessRequest = -67876, /* The access request is not valid. */
InvalidIndexInfo = -67877, /* The index information is not valid. */
InvalidNewOwner = -67878, /* The new owner is not valid. */
InvalidModifyMode = -67879, /* The modify mode is not valid. */
MissingRequiredExtension = -67880, /* A required certificate extension is missing. */
ExtendedKeyUsageNotCritical = -67881, /* The extended key usage extension was not marked critical. */
TimestampMissing = -67882, /* A timestamp was expected but was not found. */
TimestampInvalid = -67883, /* The timestamp was not valid. */
TimestampNotTrusted = -67884, /* The timestamp was not trusted. */
TimestampServiceNotAvailable = -67885, /* The timestamp service is not available. */
TimestampBadAlg = -67886, /* An unrecognized or unsupported Algorithm Identifier in timestamp. */
TimestampBadRequest = -67887, /* The timestamp transaction is not permitted or supported. */
TimestampBadDataFormat = -67888, /* The timestamp data submitted has the wrong format. */
TimestampTimeNotAvailable = -67889, /* The time source for the Timestamp Authority is not available. */
TimestampUnacceptedPolicy = -67890, /* The requested policy is not supported by the Timestamp Authority. */
TimestampUnacceptedExtension = -67891, /* The requested extension is not supported by the Timestamp Authority. */
TimestampAddInfoNotAvailable = -67892, /* The additional information requested is not available. */
TimestampSystemFailure = -67893, /* The timestamp request cannot be handled due to system failure. */
SigningTimeMissing = -67894, /* A signing time was expected but was not found. */
TimestampRejection = -67895, /* A timestamp transaction was rejected. */
TimestampWaiting = -67896, /* A timestamp transaction is waiting. */
TimestampRevocationWarning = -67897, /* A timestamp authority revocation warning was issued. */
TimestampRevocationNotification = -67898, /* A timestamp authority revocation notification was issued. */
Param = -50,
}
// typedef uint32_t SecTrustResultType;
+2 -164
View File
@@ -1,4 +1,4 @@
#if SECURITY_DEP && MONO_FEATURE_APPLETLS
#if SECURITY_DEP && MONO_FEATURE_APPLETLS
//
// ImportExport.cs
//
@@ -29,17 +29,9 @@
using System;
using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using ObjCRuntime;
using Mono.Net;
#if MONO_FEATURE_BTLS
using Mono.Btls;
#else
using Mono.Security.Cryptography;
#endif
namespace Mono.AppleTls {
internal partial class SecImportExport {
@@ -62,163 +54,9 @@ namespace Mono.AppleTls {
IntPtr handle;
SecStatusCode code = SecPKCS12Import (data.Handle, options.Handle, out handle);
array = CFArray.ArrayFromHandle <CFDictionary> (handle, h => new CFDictionary (h, false));
if (handle != IntPtr.Zero)
CFObject.CFRelease (handle);
CFObject.CFRelease (handle);
return code;
}
#if !MONOTOUCH
[DllImport (AppleTlsContext.SecurityLibrary)]
extern static SecStatusCode SecItemImport (
/* CFDataRef */ IntPtr importedData,
/* CFStringRef */ IntPtr fileNameOrExtension, // optional
/* SecExternalFormat* */ ref SecExternalFormat inputFormat, // optional, IN/OUT
/* SecExternalItemType* */ ref SecExternalItemType itemType, // optional, IN/OUT
/* SecItemImportExportFlags */ SecItemImportExportFlags flags,
/* const SecItemImportExportKeyParameters* */ IntPtr keyParams, // optional
/* SecKeychainRef */ IntPtr importKeychain, // optional
/* CFArrayRef* */ out IntPtr outItems);
static public CFArray ItemImport (byte[] buffer, string password)
{
using (var data = CFData.FromData (buffer))
using (var pwstring = CFString.Create (password)) {
SecItemImportExportKeyParameters keyParams = new SecItemImportExportKeyParameters ();
keyParams.passphrase = pwstring.Handle;
return ItemImport (data, SecExternalFormat.PKCS12, SecExternalItemType.Aggregate, SecItemImportExportFlags.None, keyParams);
}
}
static CFArray ItemImport (CFData data, SecExternalFormat format, SecExternalItemType itemType,
SecItemImportExportFlags flags = SecItemImportExportFlags.None,
SecItemImportExportKeyParameters? keyParams = null)
{
return ItemImport (data, ref format, ref itemType, flags, keyParams);
}
static CFArray ItemImport (CFData data, ref SecExternalFormat format, ref SecExternalItemType itemType,
SecItemImportExportFlags flags = SecItemImportExportFlags.None,
SecItemImportExportKeyParameters? keyParams = null)
{
IntPtr keyParamsPtr = IntPtr.Zero;
if (keyParams != null) {
keyParamsPtr = Marshal.AllocHGlobal (Marshal.SizeOf (keyParams.Value));
if (keyParamsPtr == IntPtr.Zero)
throw new OutOfMemoryException ();
Marshal.StructureToPtr (keyParams.Value, keyParamsPtr, false);
}
IntPtr result;
var status = SecItemImport (data.Handle, IntPtr.Zero, ref format, ref itemType, flags, keyParamsPtr, IntPtr.Zero, out result);
if (keyParamsPtr != IntPtr.Zero)
Marshal.FreeHGlobal (keyParamsPtr);
if (status != SecStatusCode.Success)
throw new NotSupportedException (status.ToString ());
return new CFArray (result, true);
}
[DllImport (AppleTlsContext.SecurityLibrary)]
extern static /* SecIdentityRef */ IntPtr SecIdentityCreate (
/* CFAllocatorRef */ IntPtr allocator,
/* SecCertificateRef */ IntPtr certificate,
/* SecKeyRef */ IntPtr privateKey);
static public SecIdentity ItemImport (X509Certificate2 certificate)
{
if (!certificate.HasPrivateKey)
throw new NotSupportedException ();
using (var key = ImportPrivateKey (certificate))
using (var cert = new SecCertificate (certificate)) {
var identity = SecIdentityCreate (IntPtr.Zero, cert.Handle, key.Handle);
if (CFType.GetTypeID (identity) != SecIdentity.GetTypeID ())
throw new InvalidOperationException ();
return new SecIdentity (identity, true);
}
}
static byte[] ExportKey (RSA key)
{
#if MONO_FEATURE_BTLS
using (var btlsKey = MonoBtlsKey.CreateFromRSAPrivateKey (key))
return btlsKey.GetBytes (true);
#else
return PKCS8.PrivateKeyInfo.Encode (key);
#endif
}
static SecKey ImportPrivateKey (X509Certificate2 certificate)
{
if (!certificate.HasPrivateKey)
throw new NotSupportedException ();
CFArray items;
using (var data = CFData.FromData (ExportKey ((RSA)certificate.PrivateKey)))
items = ItemImport (data, SecExternalFormat.OpenSSL, SecExternalItemType.PrivateKey);
try {
if (items.Count != 1)
throw new InvalidOperationException ("Private key import failed.");
var imported = items[0];
if (CFType.GetTypeID (imported) != SecKey.GetTypeID ())
throw new InvalidOperationException ("Private key import doesn't return SecKey.");
return new SecKey (imported, items.Handle);
} finally {
items.Dispose ();
}
}
const int SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION = 0;
// Native enum; don't change.
enum SecExternalFormat : int {
Unknown = 0,
OpenSSL = 1,
X509Cert = 9,
PEMSequence = 10,
PKCS7 = 11,
PKCS12 = 12
}
// Native enum; don't change.
enum SecExternalItemType : int {
Unknown = 0,
PrivateKey = 1,
PublicKey = 2,
SessionKey = 3,
Certificate = 4,
Aggregate = 5
}
// Native enum; don't change
enum SecItemImportExportFlags : int {
None,
PemArmour = 0x00000001, /* exported blob is PEM formatted */
}
// Native struct; don't change
[StructLayout (LayoutKind.Sequential)]
struct SecItemImportExportKeyParameters {
public int version; /* SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION */
public int flags; /* SecKeyImportExportFlags bits */
public IntPtr passphrase; /* SecExternalFormat.PKCS12 only. Legal types are CFStringRef and CFDataRef. */
IntPtr alertTitle;
IntPtr alertPrompt;
public IntPtr accessRef; /* SecAccessRef */
IntPtr keyUsage;
IntPtr keyAttributes;
}
#endif
}
}
#endif
+46 -144
View File
@@ -1,4 +1,4 @@
#if SECURITY_DEP && MONO_FEATURE_APPLETLS
#if SECURITY_DEP && MONO_FEATURE_APPLETLS
//
// Items.cs: Implements the KeyChain query access APIs
//
@@ -40,32 +40,13 @@ using Mono.Net;
namespace Mono.AppleTls {
enum SecKind {
Identity,
Certificate
Identity
}
#if MONOTOUCH
static class SecKeyChain {
#else
class SecKeyChain : INativeObject, IDisposable {
#endif
internal static readonly IntPtr MatchLimitAll;
internal static readonly IntPtr MatchLimitOne;
internal static readonly IntPtr MatchLimit;
#if !MONOTOUCH
IntPtr handle;
internal SecKeyChain (IntPtr handle, bool owns = false)
{
if (handle == IntPtr.Zero)
throw new ArgumentException ("Invalid handle");
this.handle = handle;
if (!owns)
CFObject.CFRetain (handle);
}
#endif
static readonly IntPtr MatchLimitAll;
static readonly IntPtr MatchLimitOne;
static readonly IntPtr MatchLimit;
static SecKeyChain ()
{
@@ -117,47 +98,39 @@ namespace Mono.AppleTls {
return null;
}
static INativeObject [] QueryAsReference (SecRecord query, int max, out SecStatusCode result)
public static INativeObject[] QueryAsReference (SecRecord query, int max, out SecStatusCode result)
{
if (query == null) {
if (query == null){
result = SecStatusCode.Param;
return null;
}
using (var copy = query.QueryDict.MutableCopy ()) {
using (var copy = query.queryDict.MutableCopy ()) {
copy.SetValue (CFBoolean.True.Handle, SecItem.ReturnRef);
SetLimit (copy, max);
return QueryAsReference (copy, out result);
}
}
static INativeObject [] QueryAsReference (CFDictionary query, out SecStatusCode result)
{
if (query == null) {
result = SecStatusCode.Param;
IntPtr ptr;
result = SecItem.SecItemCopyMatching (copy.Handle, out ptr);
if ((result == SecStatusCode.Success) && (ptr != IntPtr.Zero)) {
var array = CFArray.ArrayFromHandle<INativeObject> (ptr, p => {
IntPtr cfType = CFType.GetTypeID (p);
if (cfType == SecCertificate.GetTypeID ())
return new SecCertificate (p, true);
else if (cfType == SecKey.GetTypeID ())
return new SecKey (p, true);
else if (cfType == SecIdentity.GetTypeID ())
return new SecIdentity (p, true);
else
throw new Exception (String.Format ("Unexpected type: 0x{0:x}", cfType));
});
return array;
}
return null;
}
IntPtr ptr;
result = SecItem.SecItemCopyMatching (query.Handle, out ptr);
if (result == SecStatusCode.Success && ptr != IntPtr.Zero) {
var array = CFArray.ArrayFromHandle<INativeObject> (ptr, p => {
IntPtr cfType = CFType.GetTypeID (p);
if (cfType == SecCertificate.GetTypeID ())
return new SecCertificate (p, true);
if (cfType == SecKey.GetTypeID ())
return new SecKey (p, true);
if (cfType == SecIdentity.GetTypeID ())
return new SecIdentity (p, true);
throw new Exception (String.Format ("Unexpected type: 0x{0:x}", cfType));
});
return array;
}
return null;
}
internal static CFNumber SetLimit (CFMutableDictionary dict, int max)
static CFNumber SetLimit (CFMutableDictionary dict, int max)
{
CFNumber n = null;
IntPtr val;
@@ -169,112 +142,47 @@ namespace Mono.AppleTls {
n = CFNumber.FromInt32 (max);
val = n.Handle;
}
dict.SetValue (val, SecKeyChain.MatchLimit);
return n;
}
#if !MONOTOUCH
[DllImport (AppleTlsContext.SecurityLibrary)]
extern static /* OSStatus */ SecStatusCode SecKeychainCreate (/* const char * */ IntPtr pathName, uint passwordLength, /* const void * */ IntPtr password,
bool promptUser, /* SecAccessRef */ IntPtr initialAccess,
/* SecKeychainRef _Nullable * */ out IntPtr keychain);
internal static SecKeyChain Create (string pathName, string password)
{
IntPtr handle;
var pathNamePtr = Marshal.StringToHGlobalAnsi (pathName);
var passwordPtr = Marshal.StringToHGlobalAnsi (password);
var result = SecKeychainCreate (pathNamePtr, (uint)password.Length, passwordPtr, false, IntPtr.Zero, out handle);
if (result != SecStatusCode.Success)
throw new InvalidOperationException (result.ToString ());
return new SecKeyChain (handle, true);
}
[DllImport (AppleTlsContext.SecurityLibrary)]
extern static /* OSStatus */ SecStatusCode SecKeychainOpen (/* const char * */ IntPtr pathName, /* SecKeychainRef _Nullable * */ out IntPtr keychain);
internal static SecKeyChain Open (string pathName)
{
IntPtr handle;
IntPtr pathNamePtr = IntPtr.Zero;
try {
pathNamePtr = Marshal.StringToHGlobalAnsi (pathName);
var result = SecKeychainOpen (pathNamePtr, out handle);
if (result != SecStatusCode.Success)
throw new InvalidOperationException (result.ToString ());
return new SecKeyChain (handle, true);
} finally {
if (pathNamePtr != IntPtr.Zero)
Marshal.FreeHGlobal (pathNamePtr);
}
}
internal static SecKeyChain OpenSystemRootCertificates ()
{
return Open ("/System/Library/Keychains/SystemRootCertificates.keychain");
}
~SecKeyChain ()
{
Dispose (false);
}
public IntPtr Handle {
get {
return handle;
}
}
public void Dispose ()
{
Dispose (true);
GC.SuppressFinalize (this);
}
protected virtual void Dispose (bool disposing)
{
if (handle != IntPtr.Zero) {
CFObject.CFRelease (handle);
handle = IntPtr.Zero;
}
}
#endif
}
class SecRecord : IDisposable {
internal static readonly IntPtr SecClassKey;
static readonly IntPtr SecClassKey;
static SecRecord ()
{
var handle = CFObject.dlopen (AppleTlsContext.SecurityLibrary, 0);
if (handle == IntPtr.Zero)
return;
try {
SecClassKey = CFObject.GetIntPtr (handle, "kSecClass");
try {
SecClassKey = CFObject.GetIntPtr (handle, "kSecClassKey");
} finally {
CFObject.dlclose (handle);
}
}
CFMutableDictionary _queryDict;
internal CFMutableDictionary QueryDict {
// Fix <= iOS 6 Behaviour - Desk #83099
// NSCFDictionary: mutating method sent to immutable object
// iOS 6 returns an inmutable NSDictionary handle and when we try to set its values it goes kaboom
// By explicitly calling `MutableCopy` we ensure we always have a mutable reference we expect that.
CFDictionary _queryDict;
internal CFDictionary queryDict
{
get {
return _queryDict;
}
}
internal void SetValue (IntPtr key, IntPtr value)
{
_queryDict.SetValue (key, value);
set {
_queryDict = value != null ? value.Copy () : null;
}
}
public SecRecord (SecKind secKind)
{
var kind = SecClass.FromSecKind (secKind);
_queryDict = CFMutableDictionary.Create ();
_queryDict.SetValue (SecClassKey, kind);
queryDict = CFDictionary.FromObjectAndKey (kind, SecClassKey);
}
public void Dispose ()
@@ -285,10 +193,10 @@ namespace Mono.AppleTls {
protected virtual void Dispose (bool disposing)
{
if (_queryDict != null){
if (queryDict != null){
if (disposing){
_queryDict.Dispose ();
_queryDict = null;
queryDict.Dispose ();
queryDict = null;
}
}
}
@@ -301,7 +209,6 @@ namespace Mono.AppleTls {
partial class SecItem {
public static readonly IntPtr ReturnRef;
public static readonly IntPtr MatchSearchList;
static SecItem ()
{
@@ -311,7 +218,6 @@ namespace Mono.AppleTls {
try {
ReturnRef = CFObject.GetIntPtr (handle, "kSecReturnRef");
MatchSearchList = CFObject.GetIntPtr (handle, "kSecMatchSearchList");
} finally {
CFObject.dlclose (handle);
}
@@ -324,7 +230,6 @@ namespace Mono.AppleTls {
static partial class SecClass {
public static readonly IntPtr Identity;
public static readonly IntPtr Certificate;
static SecClass ()
{
@@ -332,9 +237,8 @@ namespace Mono.AppleTls {
if (handle == IntPtr.Zero)
return;
try {
try {
Identity = CFObject.GetIntPtr (handle, "kSecClassIdentity");
Certificate = CFObject.GetIntPtr (handle, "kSecClassCertificate");
} finally {
CFObject.dlclose (handle);
}
@@ -345,8 +249,6 @@ namespace Mono.AppleTls {
switch (secKind){
case SecKind.Identity:
return Identity;
case SecKind.Certificate:
return Certificate;
default:
throw new ArgumentException ("secKind");
}
@@ -161,28 +161,18 @@ namespace Mono.Net.Security
if (providerRegistration != null)
return;
providerRegistration = new Dictionary<string,string> ();
string legacyProvider = "Mono.Net.Security.LegacyTlsProvider";
providerRegistration.Add ("legacy", legacyProvider);
string defaultProvider = null;
if (IsBtlsSupported ()) {
var btlsProvider = "Mono.Btls.MonoBtlsProvider";
providerRegistration.Add ("btls", btlsProvider);
defaultProvider = btlsProvider;
}
providerRegistration.Add ("legacy", "Mono.Net.Security.LegacyTlsProvider");
if (Platform.IsMacOS) {
var appleProvider = "Mono.AppleTls.AppleTlsProvider";
providerRegistration.Add ("apple", appleProvider);
defaultProvider = appleProvider;
}
if (defaultProvider == null)
defaultProvider = legacyProvider;
providerRegistration.Add ("default", defaultProvider);
if (Platform.IsMacOS)
providerRegistration.Add ("default", "Mono.AppleTls.AppleTlsProvider");
else
providerRegistration.Add ("default", "Mono.Net.Security.LegacyTlsProvider");
if (IsBtlsSupported ())
providerRegistration.Add ("btls", "Mono.Btls.MonoBtlsProvider");
providerRegistration.Add ("apple", "Mono.AppleTls.AppleTlsProvider");
X509Helper2.Initialize ();
}
}
Loaded 100 of 276 files, more files were not shown because too many files have changed in this diff. Show more