Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

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.