Imported Upstream version 4.0.3.13

Former-commit-id: 4f1f69b42e04def9a697c2550b23b9cae645ef29
This commit is contained in:
Xamarin Public Jenkins
2015-07-20 03:39:00 -04:00
parent 4cee7df5e0
commit 2c051c3d51
138 changed files with 3829 additions and 206 deletions

View File

@@ -2,9 +2,11 @@ thisdir = class/System.IdentityModel
SUBDIRS =
include ../../build/rules.make
ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
OTHER_LIB_MCS_FLAGS = -r:System.Web.ApplicationServices.dll
endif
endif
LIBRARY = System.IdentityModel.dll
LIB_MCS_FLAGS = \
@@ -12,12 +14,15 @@ LIB_MCS_FLAGS = \
/r:System.dll \
/r:System.Xml.dll \
/r:System.Security.dll \
/r:System.Web.dll \
/r:System.Configuration.dll \
/r:Mono.Security.dll \
/r:System.Runtime.Serialization.dll \
$(OTHER_LIB_MCS_FLAGS)
ifndef NO_SYSTEM_WEB_DEPENDENCY
LIB_MCS_FLAGS += /r:System.Web.dll
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = \
@@ -26,7 +31,7 @@ EXTRA_DISTFILES = \
Test/Resources/test.pfx \
Test/Resources/test2.pfx
VALID_PROFILE := $(filter net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_5 xammac_net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.IdentityModel.dll
NO_INSTALL = yes

View File

@@ -1,3 +1,4 @@
#if !NO_SYSTEM_WEB_DEPENDENCY
//
// CustomUserNameSecurityTokenAuthenticator.cs
//
@@ -133,3 +134,4 @@ namespace System.IdentityModel.Selectors
}
}
}
#endif

View File

@@ -1,3 +1,4 @@
#if !NO_SYSTEM_WEB_DEPENDENCY
//
// UserNamePasswordValidator.cs
//
@@ -80,3 +81,4 @@ namespace System.IdentityModel.Selectors
}
}
}
#endif