Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -1120,7 +1120,7 @@ namespace System.Workflow.ComponentModel.Compiler
// add default constructors for classes unless they
// exist in the source code. Unfortunately, this cannot be easily
// fixed in the CodeDomParser because the code dom returned by that
// class is expected to kept in [....] with the real source code.
// class is expected to kept in sync with the real source code.
// So we cannot "fabricate" a default constructor there without
// breaking lots of assumptions elsewhere in the code.
// Instead, we add a default constructor here, if necessary.

View File

@ -80,7 +80,7 @@ namespace System.Workflow.ComponentModel.Design
// Properties
new CommandSetItem(new EventHandler(OnStatusAlways), new EventHandler(OnMenuDesignerProperties), WorkflowMenuCommands.DesignerProperties),
// IMPORTANT: [....] does not handle this command, so VS.NET sends it to solution explorer
// IMPORTANT: Microsoft does not handle this command, so VS.NET sends it to solution explorer
// window, which enables this meu item on the for the current file node
new CommandSetItem(new EventHandler(OnStatusAlways), new EventHandler(OnViewCode), new CommandID(StandardCommands.Cut.Guid, 333)),
@ -563,7 +563,7 @@ namespace System.Workflow.ComponentModel.Design
WorkflowView view = rootDesigner.GetView(ViewTechnology.Default) as WorkflowView;
if (view != null)
{
//because the some key presses are not coming into the [....] OnKeyDown
//because the some key presses are not coming into the Microsoft OnKeyDown
//we need to do this work around to manually send the keypress into the designer
KeyEventArgs eventArgs = new KeyEventArgs(key);

View File

@ -25,7 +25,7 @@ namespace System.Workflow.ComponentModel.Design
[Obsolete("The System.Workflow.* types are deprecated. Instead, please use the new types from System.Activities.*")]
public sealed class ThemeConfigurationDialog : System.Windows.Forms.Form
{
#region [....] Generated Members
#region Microsoft Generated Members
private System.Windows.Forms.Button button3;
private System.Windows.Forms.TreeView designerTreeView;
private System.Windows.Forms.Label themeNameLabel;

View File

@ -14,7 +14,7 @@ namespace System.Workflow.ComponentModel.Design
[Obsolete("The System.Workflow.* types are deprecated. Instead, please use the new types from System.Activities.*")]
public sealed class WorkflowPageSetupDialog : System.Windows.Forms.Form
{
#region [....] Desiger Generated Members
#region Microsoft Desiger Generated Members
private System.ComponentModel.Container components = null;
private System.Windows.Forms.TabControl tabs;
private System.Windows.Forms.PictureBox landscapePicture;

View File

@ -60,7 +60,7 @@ namespace System.Workflow.ComponentModel.Design
private const int cmdidWOEShowAll = 0x3107;
public const int FirstZoomCommand = cmdidWOEZoom400; //the first and last zoom commands
public const int LastZoomCommand = cmdidWOEShowAll; //should be in [....] with the \private\Core\Tools\OrchestrationDesignerUI\PkgCmdID.h
public const int LastZoomCommand = cmdidWOEShowAll; //should be in sync with the \private\Core\Tools\OrchestrationDesignerUI\PkgCmdID.h
// page layout
private const int cmdidDefaultPage = 0x3110;

View File

@ -64,7 +64,7 @@ namespace System.Workflow.ComponentModel.Design
{
// If the references are null, create them for the first time and connect
// up our events to listen to changes to the container. Otherwise, check to
// see if the added or removed lists contain anything for us to [....] up.
// see if the added or removed lists contain anything for us to sync up.
//
if (this.references == null)
{

View File

@ -150,7 +150,7 @@ namespace System.Workflow.ComponentModel.Design
//activities with errors we want to reveal these activities
DesignerHelpers.RefreshDesignerActions(Activity.Site);
//Keep the dynamic action and designer verbs in [....]
//Keep the dynamic action and designer verbs in sync
RefreshDesignerVerbs();
}
}

View File

@ -181,7 +181,7 @@ namespace System.Workflow.ComponentModel.Design
//Initialize the tooltip shown
this.workflowToolTip = new WorkflowToolTip(this);
//[....] the global theme change event, which is fired by the theme infrastructure for theme change
//Sync the global theme change event, which is fired by the theme infrastructure for theme change
WorkflowTheme.ThemeChanged += new EventHandler(OnThemeChange);
//Create the core message filters

View File

@ -21,7 +21,7 @@ using System.Workflow.ComponentModel.Compiler;
/*********************************************************************
* NOTE: A copy of this file exists at: WF\Activities\Common
* The two files must be kept in [....]. Any change made here must also
* The two files must be kept in sync. Any change made here must also
* be made to WF\Activities\Common\BasePropertyDescriptor.cs
*********************************************************************/

View File

@ -9,7 +9,7 @@
/*********************************************************************
* NOTE: A copy of this file exists at: WF\Activities\Common
* The two files must be kept in [....]. Any change made here must also
* The two files must be kept in sync. Any change made here must also
* be made to WF\Activities\Common\CompModHelpers.cs
*********************************************************************/
namespace System.Workflow.ComponentModel.Design

View File

@ -9,7 +9,7 @@
/*********************************************************************
* NOTE: A copy of this file exists at: WF\Activities\Common
* The two files must be kept in [....]. Any change made here must also
* The two files must be kept in sync. Any change made here must also
* be made to WF\Activities\Common\CompilerHelpers.cs
*********************************************************************/

View File

@ -9,7 +9,7 @@
/*********************************************************************
* NOTE: A copy of this file exists at: WF\Activities\Common
* The two files must be kept in [....]. Any change made here must also
* The two files must be kept in sync. Any change made here must also
* be made to WF\Activities\Common\DelegateTypeInfo.cs
*********************************************************************/
namespace System.Workflow.ComponentModel

View File

@ -9,7 +9,7 @@
/*********************************************************************
* NOTE: A copy of this file exists at: WF\Activities\Common
* The two files must be kept in [....]. Any change made here must also
* The two files must be kept in sync. Any change made here must also
* be made to WF\Activities\Common\NativeMethods.cs
*********************************************************************/
namespace System.Workflow.Interop

View File

@ -9,7 +9,7 @@
/*********************************************************************
* NOTE: A copy of this file exists at: WF\Activities\Common
* The two files must be kept in [....]. Any change made here must also
* The two files must be kept in sync. Any change made here must also
* be made to WF\Activities\Common\TypeSystemHelpers.cs
*********************************************************************/
namespace System.Workflow.ComponentModel.Compiler

View File

@ -9,7 +9,7 @@
/*********************************************************************
* NOTE: A copy of this file exists at: WF\Activities\Common
* The two files must be kept in [....]. Any change made here must also
* The two files must be kept in sync. Any change made here must also
* be made to WF\Activities\Common\ValidationHelpers.cs
*********************************************************************/
namespace System.Workflow.ComponentModel.Compiler

View File

@ -9,7 +9,7 @@
/*********************************************************************
* NOTE: A copy of this file exists at: WF\Activities\Common
* The two files must be kept in [....]. Any change made here must also
* The two files must be kept in sync. Any change made here must also
* be made to WF\Activities\Common\Walker.cs
*********************************************************************/
namespace System.Workflow.ComponentModel

View File

@ -9,7 +9,7 @@
/*********************************************************************
* NOTE: A copy of this file exists at: WF\Activities\Common
* The two files must be kept in [....]. Any change made here must also
* The two files must be kept in sync. Any change made here must also
* be made to WF\Activities\Common\UserDataKeys.cs
*********************************************************************/
namespace System.Workflow.ComponentModel