Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -58,7 +58,6 @@ namespace System.Diagnostics
InnerList.AddRange (processModules);
}
#if !NET_2_1
public ProcessModule this[int index] {
get {
return (ProcessModule)InnerList[index];
@@ -79,6 +78,5 @@ namespace System.Diagnostics
{
return InnerList.IndexOf (module);
}
#endif
}
}

View File

@@ -41,204 +41,11 @@ using System.Runtime.InteropServices;
namespace System.Diagnostics
{
[TypeConverter (typeof (ExpandableObjectConverter))]
[PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)]
[StructLayout (LayoutKind.Sequential)]
public sealed class ProcessStartInfo
public sealed partial class ProcessStartInfo
{
/* keep these fields in this order and in sync with metadata/process.h */
private string arguments;
private IntPtr error_dialog_parent_handle = (IntPtr)0;
private string filename;
private string verb;
private string working_directory;
private StringDictionary envVars;
private bool create_no_window = false;
private bool error_dialog = false;
private bool redirect_standard_error = false;
private bool redirect_standard_input = false;
private bool redirect_standard_output = false;
private bool use_shell_execute = true;
private ProcessWindowStyle window_style = ProcessWindowStyle.Normal;
private Encoding encoding_stderr, encoding_stdout;
private string username, domain;
private SecureString password;
private bool load_user_profile;
public ProcessStartInfo()
{
}
public ProcessStartInfo(string filename)
{
this.filename = filename;
}
public ProcessStartInfo(string filename, string arguments)
{
this.filename = filename;
this.arguments = arguments;
}
[RecommendedAsConfigurable (true), DefaultValue ("")]
[TypeConverter ("System.Diagnostics.Design.StringValueConverter, " + Consts.AssemblySystem_Design)]
[MonitoringDescription ("Command line agruments for this process.")]
[NotifyParentPropertyAttribute (true)]
public string Arguments {
get {
return arguments ?? string.Empty;
}
set {
arguments = value;
}
}
[DefaultValue (false)]
[MonitoringDescription ("Start this process with a new window.")]
[NotifyParentPropertyAttribute (true)]
public bool CreateNoWindow {
get {
return(create_no_window);
}
set {
create_no_window = value;
}
}
[DesignerSerializationVisibility (DesignerSerializationVisibility.Content), DefaultValue (null)]
[Editor ("System.Diagnostics.Design.StringDictionaryEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
[MonitoringDescription ("Environment variables used for this process.")]
[NotifyParentPropertyAttribute (true)]
public StringDictionary EnvironmentVariables {
get {
if (envVars == null) {
// check for non-Unix platforms - see FAQ for more details
// http://www.mono-project.com/FAQ:_Technical#How_to_detect_the_execution_platform_.3F
int platform = (int) Environment.OSVersion.Platform;
if ((platform != 4) && (platform != 128)) {
envVars = new StringDictionary ();
} else {
envVars = new CaseSensitiveStringDictionary ();
}
foreach (DictionaryEntry entry in Environment.GetEnvironmentVariables ())
envVars.Add ((string) entry.Key, (string) entry.Value);
}
return envVars;
}
}
internal bool HaveEnvVars {
get { return (envVars != null); }
}
[DefaultValue (false)]
[MonitoringDescription ("Thread shows dialogboxes for errors.")]
[NotifyParentPropertyAttribute (true)]
public bool ErrorDialog {
get {
return(error_dialog);
}
set {
error_dialog = value;
}
}
[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden), Browsable (false)]
public IntPtr ErrorDialogParentHandle {
get {
return(error_dialog_parent_handle);
}
set {
error_dialog_parent_handle = value;
}
}
[RecommendedAsConfigurable (true), DefaultValue ("")]
[Editor ("System.Diagnostics.Design.StartFileNameEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
[TypeConverter ("System.Diagnostics.Design.StringValueConverter, " + Consts.AssemblySystem_Design)]
[MonitoringDescription ("The name of the resource to start this process.")]
[NotifyParentPropertyAttribute (true)]
public string FileName {
get {
return filename ?? string.Empty;
}
set {
filename = value;
}
}
[DefaultValue (false)]
[MonitoringDescription ("Errors of this process are redirected.")]
[NotifyParentPropertyAttribute (true)]
public bool RedirectStandardError {
get {
return(redirect_standard_error);
}
set {
redirect_standard_error = value;
}
}
[DefaultValue (false)]
[MonitoringDescription ("Standard input of this process is redirected.")]
[NotifyParentPropertyAttribute (true)]
public bool RedirectStandardInput {
get {
return(redirect_standard_input);
}
set {
redirect_standard_input = value;
}
}
[DefaultValue (false)]
[MonitoringDescription ("Standard output of this process is redirected.")]
[NotifyParentPropertyAttribute (true)]
public bool RedirectStandardOutput {
get {
return(redirect_standard_output);
}
set {
redirect_standard_output = value;
}
}
public Encoding StandardErrorEncoding {
get { return encoding_stderr; }
set { encoding_stderr = value; }
}
public Encoding StandardOutputEncoding {
get { return encoding_stdout; }
set { encoding_stdout = value; }
}
[DefaultValue (true)]
[MonitoringDescription ("Use the shell to start this process.")]
[NotifyParentPropertyAttribute (true)]
public bool UseShellExecute {
get {
return(use_shell_execute);
}
set {
use_shell_execute = value;
}
}
[DefaultValue ("")]
[TypeConverter ("System.Diagnostics.Design.VerbConverter, " + Consts.AssemblySystem_Design)]
[MonitoringDescription ("The verb to apply to a used document.")]
[NotifyParentPropertyAttribute (true)]
public string Verb {
get {
return verb ?? string.Empty;
}
set {
verb = value;
}
get { return (environmentVariables != null); }
}
static readonly string [] empty = new string [0];
@@ -249,14 +56,13 @@ namespace System.Diagnostics
#if MOBILE
return empty;
#else
switch (Environment.OSVersion.Platform) {
switch (System.Environment.OSVersion.Platform) {
case (PlatformID)4:
case (PlatformID)6:
case (PlatformID)128:
return empty; // no verb on non-Windows
default:
string ext = filename == null | filename.Length == 0 ?
null : Path.GetExtension (filename);
string ext = String.IsNullOrEmpty (fileName) ? null : Path.GetExtension (fileName);
if (ext == null)
return empty;
@@ -279,54 +85,5 @@ namespace System.Diagnostics
#endif
}
}
[DefaultValue (typeof (ProcessWindowStyle), "Normal")]
[MonitoringDescription ("The window style used to start this process.")]
[NotifyParentPropertyAttribute (true)]
public ProcessWindowStyle WindowStyle {
get {
return(window_style);
}
set {
window_style = value;
}
}
[RecommendedAsConfigurable (true), DefaultValue ("")]
[Editor ("System.Diagnostics.Design.WorkingDirectoryEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
[TypeConverter ("System.Diagnostics.Design.StringValueConverter, " + Consts.AssemblySystem_Design)]
[MonitoringDescription ("The initial directory for this process.")]
[NotifyParentPropertyAttribute (true)]
public string WorkingDirectory {
get {
return working_directory ?? string.Empty;
}
set {
working_directory = value;
}
}
[NotifyParentPropertyAttribute (true)]
public bool LoadUserProfile {
get { return load_user_profile; }
set { load_user_profile = value; }
}
[NotifyParentPropertyAttribute (true)]
public string UserName {
get { return username ?? string.Empty; }
set { username = value; }
}
[NotifyParentPropertyAttribute (true)]
public string Domain {
get { return domain ?? string.Empty; }
set { domain = value; }
}
public SecureString Password {
get { return password; }
set { password = value; }
}
}
}

View File

@@ -69,7 +69,6 @@ namespace System.Diagnostics
InnerList.AddRange (processThreads);
}
#if !NET_2_1
public ProcessThread this[int index] {
get {
return (ProcessThread)InnerList[index];
@@ -105,6 +104,5 @@ namespace System.Diagnostics
{
InnerList.Remove (thread);
}
#endif
}
}