2010-04-15 Atsushi Enomoto <atsushi@ximian.com>

	* XmlnsCompatibleWithAttribute.cs
	  IComponentConnector.cs
	  XmlLangPropertyAttribute.cs
	  XamlSetMarkupExtensionEventArgs.cs
	  PropertyDefinition.cs
	  XmlnsDefinitionAttribute.cs
	  XmlnsPrefixAttribute.cs : another corcompare fix.

svn path=/trunk/mcs/; revision=155511

diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ChangeLog b/mcs/class/System.Xaml/System.Windows.Markup/ChangeLog
index 0969e71b0ac7e677031547713120159d3549fc3f..e41c170b04d2c8871fe1ea6ebf2985ff5c6feaeb 100644 (file)
--- a/mcs/class/System.Xaml/System.Windows.Markup/ChangeLog
+++ b/mcs/class/System.Xaml/System.Windows.Markup/ChangeLog
@@ -1,3 +1,13 @@
+2010-04-15  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XmlnsCompatibleWithAttribute.cs
+         IComponentConnector.cs
+         XmlLangPropertyAttribute.cs
+         XamlSetMarkupExtensionEventArgs.cs
+         PropertyDefinition.cs
+         XmlnsDefinitionAttribute.cs
+         XmlnsPrefixAttribute.cs : another corcompare fix.
+
 2010-04-15  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XData.cs : actual implementation.

diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IComponentConnector.cs b/mcs/class/System.Xaml/System.Windows.Markup/IComponentConnector.cs
index 5c7d6ac9982a0c69451abc0695a0fea3b43b0ab3..5e6081628fdb13caddd3b5391de9aa8328c8f284 100755 (executable)
--- a/mcs/class/System.Xaml/System.Windows.Markup/IComponentConnector.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/IComponentConnector.cs
@@ -28,6 +28,7 @@ using System.Xaml.Schema;
 
 namespace System.Windows.Markup
 {
+       [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
        public interface IComponentConnector
        {
                void Connect (int connectionId, object target);

diff --git a/mcs/class/System.Xaml/System.Windows.Markup/PropertyDefinition.cs b/mcs/class/System.Xaml/System.Windows.Markup/PropertyDefinition.cs
index fb61a24d2ebbdc8a746e5f0913127a4e93210bd5..4a4e9fef7796efed1154f3db8f15c62ab847435e 100755 (executable)
--- a/mcs/class/System.Xaml/System.Windows.Markup/PropertyDefinition.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/PropertyDefinition.cs
@@ -38,6 +38,7 @@ namespace System.Windows.Markup
 
                public IList<Attribute> Attributes { get; private set; }
 
+               [DefaultValue ("public")]
                public string Modifier { get; set; }
 
                string name;

diff --git a/mcs/class/System.Xaml/System.Windows.Markup/XamlSetMarkupExtensionEventArgs.cs b/mcs/class/System.Xaml/System.Windows.Markup/XamlSetMarkupExtensionEventArgs.cs
index f747714c6c46beba862ae1741d6b05fb70c03645..6ffe3e57d8d6858df781892725047cc924ae720e 100644 (file)
--- a/mcs/class/System.Xaml/System.Windows.Markup/XamlSetMarkupExtensionEventArgs.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/XamlSetMarkupExtensionEventArgs.cs
@@ -41,5 +41,9 @@ namespace System.Windows.Markup
                public MarkupExtension MarkupExtension { get; private set; }
                public IServiceProvider ServiceProvider { get; private set; }
 
+               public override void CallBase ()
+               {
+                       throw new NotImplementedException ();
+               }
        }
 }

diff --git a/mcs/class/System.Xaml/System.Windows.Markup/XmlLangPropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/XmlLangPropertyAttribute.cs
index bf244082f02587a73c159285869c693a52a90335..4789120383bcd68f58744e8c1bab6cad5cb87797 100755 (executable)
--- a/mcs/class/System.Xaml/System.Windows.Markup/XmlLangPropertyAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/XmlLangPropertyAttribute.cs
@@ -31,6 +31,7 @@ using System.Xaml.Schema;
 namespace System.Windows.Markup
 {
        [AttributeUsage (AttributeTargets.Class, AllowMultiple = false)]
+       [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
        public sealed class XmlLangPropertyAttribute : Attribute
        {
                public XmlLangPropertyAttribute (string name)

diff --git a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsCompatibleWithAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsCompatibleWithAttribute.cs
index 371cea7aa7a03d0da22129160641ee0f073a02f7..0e16db2f15d641427a2105f327c69836d84a8ed8 100755 (executable)
--- a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsCompatibleWithAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsCompatibleWithAttribute.cs
@@ -31,6 +31,7 @@ using System.Xaml.Schema;
 namespace System.Windows.Markup
 {
        [AttributeUsage (AttributeTargets.Assembly, AllowMultiple = true)]
+       [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
        public sealed class XmlnsCompatibleWithAttribute : Attribute
        {
                public XmlnsCompatibleWithAttribute (string oldNamespace, string newNamespace)

diff --git a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsDefinitionAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsDefinitionAttribute.cs
index 847161d5e0198e01ae4813bd2cedd2962123df29..81be2dae73ddd196c5fe91c52666b4d752c79244 100755 (executable)
--- a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsDefinitionAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsDefinitionAttribute.cs
@@ -31,6 +31,7 @@ using System.Xaml.Schema;
 namespace System.Windows.Markup
 {
        [AttributeUsage (AttributeTargets.Assembly, AllowMultiple = true)]
+       [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
        public sealed class XmlnsDefinitionAttribute : Attribute
        {
                public XmlnsDefinitionAttribute (string xmlNamespace, string clrNamespace)

diff --git a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsPrefixAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsPrefixAttribute.cs
index 683bcc18d7cabec3425a9911a6c4c3e2195a4b76..c907c8eb427ea73da73311c2448ec497a41fb8aa 100755 (executable)
--- a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsPrefixAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsPrefixAttribute.cs
@@ -31,6 +31,7 @@ using System.Xaml.Schema;
 namespace System.Windows.Markup
 {
        [AttributeUsage (AttributeTargets.Assembly, AllowMultiple = true)]
+       [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
        public sealed class XmlnsPrefixAttribute : Attribute
        {
                public XmlnsPrefixAttribute (string xmlNamespace, string prefix)