diff options
Diffstat (limited to 'mcs/class/referencesource/System.Workflow.Activities/Common')
10 files changed, 20 insertions, 20 deletions
diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/AssemblyRef.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/AssemblyRef.cs index 32c3b596e42..11669fc9a3d 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/AssemblyRef.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/AssemblyRef.cs @@ -11,7 +11,7 @@ using System; /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\AssemblyRef.cs *********************************************************************/ diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/BasePropertyDescriptor.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/BasePropertyDescriptor.cs index edf00c3bb36..6217eb68757 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/BasePropertyDescriptor.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/BasePropertyDescriptor.cs @@ -22,7 +22,7 @@ using System.Workflow.ComponentModel.Design; /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\BasePropertyDescriptor.cs *********************************************************************/ @@ -414,8 +414,8 @@ namespace System.Workflow.Activities.Common { if (this.avoidDuplication) { - // WinOE Bug 10442: should only prefix with "(Parameter)" if there is and existing - // member of the same name. + // WinOE + return GetParameterPropertyName(this.componentType, base.Name); } else diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/CompModHelpers.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/CompModHelpers.cs index cc6b22aba9e..904f2cb3041 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/CompModHelpers.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/CompModHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\CompModHelpers.cs *********************************************************************/ @@ -1169,10 +1169,10 @@ namespace System.Workflow.Activities.Common Guid parentContextGuid = GetRuntimeContextGuid(parentContextActivity); while (activity == null && declaringContextGuid != currentContextGuid) { - // WinOE Bug 17931: if the context id is different, it means that this activity is running in a child context (such as - // the children of a replicator or a while). we need to resolve the activity within the child context - // first. If we go up to the declaring activity, we'd be finding children of the template instead of - // the actual running instance. + // WinOE + + + while (parentContextActivity != null && parentContextGuid == currentContextGuid) { currentContextActivity = parentContextActivity; @@ -1395,10 +1395,10 @@ namespace System.Workflow.Activities.Common } #endregion - // This class has been added as a fix for bug 18214 in order to - // create an independent code-path for debugger's use of ParseActivity functionality. - // The GetActivity method of this class uses QualifiedName instead of Name property - // for finding activities. + // This class has been added as a fix for + + + internal static class DebuggerHelpers { [SuppressMessage("Microsoft.Globalization", "CA1307:SpecifyStringComparison", Justification = "IndexOf(\".\") not a security issue.")] diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/CompilerHelpers.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/CompilerHelpers.cs index d02d9fe9138..27ec4c11f6d 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/CompilerHelpers.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/CompilerHelpers.cs @@ -10,7 +10,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\CompilerHelpers.cs *********************************************************************/ diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/DelegateTypeInfo.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/DelegateTypeInfo.cs index c3667ac5b60..a7f911669f6 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/DelegateTypeInfo.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/DelegateTypeInfo.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\DelegateTypeInfo.cs *********************************************************************/ diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/NativeMethods.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/NativeMethods.cs index 38e72c5ab8c..8870aea0337 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/NativeMethods.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/NativeMethods.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\NativeMethods.cs *********************************************************************/ namespace System.Workflow.Activities.Common diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/TypeSystemHelpers.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/TypeSystemHelpers.cs index caa3bbcf2bc..d8cc8d986e5 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/TypeSystemHelpers.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/TypeSystemHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\TypeSystemHelpers.cs *********************************************************************/ namespace System.Workflow.Activities.Common diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/ValidationHelpers.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/ValidationHelpers.cs index b0ada5fd4c6..65a90259007 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/ValidationHelpers.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/ValidationHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\ValidationHelpers.cs *********************************************************************/ namespace System.Workflow.Activities.Common diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/Walker.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/Walker.cs index 9bd77fe7ed7..7e450ac2b2f 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/Walker.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/Walker.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\Walker.cs *********************************************************************/ namespace System.Workflow.Activities.Common diff --git a/mcs/class/referencesource/System.Workflow.Activities/Common/userdatakeys.cs b/mcs/class/referencesource/System.Workflow.Activities/Common/userdatakeys.cs index 96aeacd9207..b2a5a7a3302 100644 --- a/mcs/class/referencesource/System.Workflow.Activities/Common/userdatakeys.cs +++ b/mcs/class/referencesource/System.Workflow.Activities/Common/userdatakeys.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * 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\Common\Shared\userdatakeys.cs *********************************************************************/ namespace System.Workflow.Activities.Common |