mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.0.179

Browse Source 
Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
external/referencesource/System/compmod/system/codedom/compiler/CompilerParameters.cs vendored
View File

@@ -50,7 +50,11 @@ namespace System.CodeDom.Compiler {
private bool generateExecutable = false;
private TempFileCollection tempFiles;
[NonSerializedAttribute]
#if MONO
IntPtr userToken;
#else
private SafeUserTokenHandle userToken;
#endif
private Evidence evidence = null;
/// <devdoc>
@@ -305,25 +309,33 @@ namespace System.CodeDom.Compiler {
/// </devdoc>
public IntPtr UserToken {
get {
#if MONO
return userToken;
#else
if (userToken != null)
return userToken.DangerousGetHandle();
else
return IntPtr.Zero;
#endif
}
set {
#if MONO
userToken = value;
#else
if (userToken != null)
userToken.Close();
userToken = new SafeUserTokenHandle(value, false);
#endif
}
}
#if !MONO
internal SafeUserTokenHandle SafeUserToken {
get {
return userToken;
}
}
#endif
/// <devdoc>
/// <para>
/// Set the evidence for partially trusted scenarios.

14
external/referencesource/System/compmod/system/componentmodel/CategoryAttribute.cs vendored
View File

@@ -287,8 +287,6 @@ namespace System.ComponentModel {
return "PropertyCategoryDDE";
case "Design":
return "PropertyCategoryDesign";
case "DragDrop":
return "PropertyCategoryDragDrop";
case "Focus":
return "PropertyCategoryFocus";
case "Font":
@@ -299,8 +297,6 @@ namespace System.ComponentModel {
return "PropertyCategoryList";
case "Layout":
return "PropertyCategoryLayout";
case "Default":
return "PropertyCategoryDefault";
case "Mouse":
return "PropertyCategoryMouse";
case "Position":
@@ -309,10 +305,16 @@ namespace System.ComponentModel {
return "PropertyCategoryText";
case "Scale":
return "PropertyCategoryScale";
case "WindowStyle":
return "PropertyCategoryWindowStyle";
case "Config":
return "PropertyCategoryConfig";
#if !MOBILE
case "Default":
return "PropertyCategoryDefault";
case "DragDrop":
return "PropertyCategoryDragDrop";
case "WindowStyle":
return "PropertyCategoryWindowStyle";
#endif
}
return value;
#else

6
external/referencesource/System/compmod/system/componentmodel/DebugReflectPropertyDescriptor.cs vendored
View File

@@ -380,8 +380,9 @@ namespace System.ComponentModel {
else {
args = new Type[] {receiverType};
}
#if !DISABLE_CAS_USE
IntSecurity.FullReflection.Assert();
#endif
try {
resetMethod = FindMethod(componentClass, "Reset" + Name, args, typeof(void), /* publicOnly= */ false);
}
@@ -455,8 +456,9 @@ namespace System.ComponentModel {
else {
args = new Type[] {receiverType};
}
#if !DISABLE_CAS_USE
IntSecurity.FullReflection.Assert();
#endif
try {
shouldSerializeMethod = FindMethod(componentClass, "ShouldSerialize" + Name,
args, typeof(Boolean), /* publicOnly= */ false);

2
external/referencesource/System/compmod/system/componentmodel/DebugTypeDescriptor.cs.REMOVED.git-id vendored
View File

@@ -1 +1 @@
fceaae50218d62bbe997268beabbf449f18d3814
f752570b56b0344fb14501e2ef45a8b5949b1528

6
external/referencesource/System/net/System/Net/ServicePointManager.cs vendored
View File

@@ -22,7 +22,7 @@ namespace System.Net {
using Microsoft.Win32;
// This turned to be a legacy type name that is simply forwarded to System.Security.Authentication.SslProtocols defined values.
#if !FEATURE_PAL
#if !MONO && !FEATURE_PAL
[Flags]
public enum SecurityProtocolType
{
@@ -121,7 +121,7 @@ namespace System.Net {
internal bool result;
}
}
#elif MONO || !FEATURE_PAL
internal class ServerCertValidationCallback
{
readonly RemoteCertificateValidationCallback m_ValidationCallback;
@@ -190,6 +190,7 @@ namespace System.Net {
}
#endif // !FEATURE_PAL
#if MONO_FEATURE_WEB_STACK
//
// The ServicePointManager class hands out ServicePoints (may exist or be created
// as needed) and makes sure they are garbage collected when they expire.
@@ -1073,4 +1074,5 @@ namespace System.Net {
GlobalLog.Leave("ServicePointManager::SetTcpKeepAlive()");
}
}
#endif
}

12
external/referencesource/System/net/System/Net/_SecureChannel.cs vendored
View File

@@ -1296,13 +1296,6 @@ namespace System.Net.Security {
// we don't catch exceptions in this method, so it's safe for "accepted" be initialized with true
bool success = false;
#if MONO
if (IsServer)
// FIXME
success = true;
else
success = SSPIWrapper.CheckRemoteCertificate(m_SecurityContext);
#else
X509Chain chain = null;
X509Certificate2 remoteCertificateEx = null;
@@ -1316,6 +1309,7 @@ namespace System.Net.Security {
GlobalLog.Leave("SecureChannel#" + ValidationHelper.HashString(this) + "::VerifyRemoteCertificate (no remote cert)", (!m_RemoteCertRequired).ToString());
sslPolicyErrors |= SslPolicyErrors.RemoteCertificateNotAvailable;
}
#if !MONO
else
{
chain = new X509Chain();
@@ -1368,6 +1362,9 @@ namespace System.Net.Security {
else
success = (sslPolicyErrors == SslPolicyErrors.None);
}
#else
success = SSPIWrapper.CheckRemoteCertificate(m_SecurityContext);
#endif
if (Logging.On) {
if (sslPolicyErrors != SslPolicyErrors.None)
@@ -1406,7 +1403,6 @@ namespace System.Net.Security {
remoteCertificateEx.Reset();
}
GlobalLog.Leave("SecureChannel#" + ValidationHelper.HashString(this) + "::VerifyRemoteCertificate", success.ToString());
#endif
return success;
}