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: 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
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